diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-02-20 14:43:01 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-02-20 14:43:01 +0900 |
| commit | 02be6a08f92015295c918fde1c50c401d56f01ff (patch) | |
| tree | 8c17ad08dc22753642603f53b8b1ae85cdc73af9 /src/web | |
| parent | wip (diff) | |
| parent | Merge pull request #188 from syuilo/remove-charts (diff) | |
| download | misskey-02be6a08f92015295c918fde1c50c401d56f01ff.tar.gz misskey-02be6a08f92015295c918fde1c50c401d56f01ff.tar.bz2 misskey-02be6a08f92015295c918fde1c50c401d56f01ff.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls
# Conflicts:
# src/web/app/desktop/tags/post-status-graph.tag
# src/web/app/desktop/tags/user-friends-graph.tag
# src/web/app/desktop/tags/user-likes-graph.tag
# src/web/app/desktop/tags/user-posts-graph.tag
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/app/desktop/script.js | 1 | ||||
| -rw-r--r-- | src/web/app/desktop/tags/index.js | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/web/app/desktop/script.js b/src/web/app/desktop/script.js index b1ac0b4e35..dd4d2ef933 100644 --- a/src/web/app/desktop/script.js +++ b/src/web/app/desktop/script.js @@ -5,7 +5,6 @@ // Style import './style.styl'; -require('chart.js'); require('./tags'); const riot = require('riot'); const boot = require('../boot'); diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js index a00cb4f582..ed100ef75c 100644 --- a/src/web/app/desktop/tags/index.js +++ b/src/web/app/desktop/tags/index.js @@ -81,10 +81,6 @@ require('./sub-post-content.tag'); require('./images-viewer.tag'); require('./image-dialog.tag'); require('./donation.tag'); -require('./user-posts-graph.tag'); -require('./user-friends-graph.tag'); -require('./user-likes-graph.tag'); -require('./post-status-graph.tag'); require('./users-list.tag'); require('./user-following.tag'); require('./user-followers.tag'); |