graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-14 19:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity
2796 commits 62 branches 916 tags 154 MiB
Commit graph

717 commits

Author SHA1 Message Date
syuilo
3454e137b7 Refactorung 2017-05-18 14:12:27 +09:00
syuilo
81c5293c6c ✌️ 2017-05-18 05:18:32 +09:00
syuilo
c72a07187a なんかもうめっちゃ変えた 2017-05-18 05:06:55 +09:00
syuilo
2d485730f0 Revert "Compress an assets" 
This reverts commit 4c2a3d8df0.
 2017-05-17 00:36:04 +09:00
syuilo
4c2a3d8df0 Compress an assets 2017-05-17 00:28:45 +09:00
syuilo
4da7d84c0a Refactor 2017-05-11 07:19:26 +09:00
syuilo
c3cef31974 Refactor 2017-05-11 05:08:12 +09:00
syuilo⭐️
3d794980b0 Update boot.js 2017-05-11 04:15:54 +09:00
syuilo⭐️
7a8e859b40 Update base.styl 2017-05-09 16:26:37 +09:00
syuilo
dae9801827 🎨 2017-05-09 16:19:52 +09:00
syuilo
f218425f69 [Client] Improve usability 2017-05-09 16:14:12 +09:00
syuilo
e0e3c43259 [Client] Fix bug 2017-05-09 00:37:10 +09:00
syuilo
b1860b244f Better blue screen 2017-05-08 23:35:59 +09:00
syuilo⭐️
38e4dcd319 Improve readability 2017-04-26 16:36:29 +09:00
syuilo⭐️
580e06360e Update script.js 2017-04-17 15:52:38 +09:00
syuilo
da22155a98 [Client:Desktop] White header 2017-04-15 22:19:15 +09:00
syuilo
7109ea8c67 Remove the Live service 
Because it seems unavailable
 2017-04-15 22:05:23 +09:00
Aya Morisawa
b095efaee5 Migrate to tslint 5.1.0 2017-04-14 20:45:37 +09:00
syuilo
d863599f30 [Client] Fix #401 2017-04-09 16:01:49 +09:00
syuilo⭐️
4f91e9d260 (chore) Improve readability 2017-04-09 09:57:54 +09:00
Aya Morisawa
8a753f684d l10n 2017-04-04 20:45:35 +09:00
Aya Morisawa
c0e14ae264 WIP #332 2017-04-04 20:07:13 +09:00
ha-dai
3c3d0f659f [Client:Mobile] 🎨 2017-04-02 10:02:48 +09:00
syuilo
55744da20f [Client] Fix bug 2017-04-02 03:54:16 +09:00
syuilo
23a3239190 typo 2017-04-02 03:35:34 +09:00
syuilo
49296aac38 wip #332 2017-04-02 03:34:36 +09:00
syuilo
f8505562ac [Client] 🎨 2017-04-02 03:28:14 +09:00
Aya Morisawa
a966cd4840 Make it easy to open link 2017-04-02 03:18:28 +09:00
Aya Morisawa
00f779b7a0 Fix bug 2017-04-02 03:14:03 +09:00
Aya Morisawa
7770eac9cb Fix typo 2017-04-02 03:01:41 +09:00
syuilo
6952795e18 [Client] 🎨 2017-04-01 09:39:05 +09:00
ha-dai
772a8b9ffb Better display than before. 2017-04-01 09:30:40 +09:00
ha-dai
0307dbb35b Add link to individual page. 2017-04-01 09:06:20 +09:00
syuilo⭐️
11560f138d Update drive.tag 2017-04-01 07:32:18 +09:00
syuilo⭐️
3dd64f0801 Update drive.tag 2017-04-01 07:31:02 +09:00
syuilo
dffa501904 [Client] Fix design 2017-04-01 07:01:17 +09:00
syuilo
b7dd711b50 [Client] Clean up 2017-04-01 06:50:11 +09:00
syuilo
4d34386f7f [Client] Fix 2017-04-01 06:48:08 +09:00
syuilo
1872869142 [Client] Fix HTML 2017-04-01 06:44:22 +09:00
Aya Morisawa
8e8dfb88fb WIP #332 2017-03-31 23:33:43 +09:00
Aya Morisawa
5b280d8467 Fix bug 2017-03-31 22:02:16 +09:00
syuilo
b17d65a3fd [Client] Fix 2017-03-31 20:04:38 +09:00
Aya Morisawa
b736e78af2 WIP #332 2017-03-31 19:56:59 +09:00
Aya Morisawa
f48dc2a4bf Merge remote-tracking branch 'origin/master' 2017-03-31 04:15:04 +09:00
Aya Morisawa
4a70af8b62 WIP #332 2017-03-31 04:14:32 +09:00
syuilo⭐️
8b1e56957d Update script.js 2017-03-31 03:29:39 +09:00
syuilo
c352aafb3e [Client] ✌️ 2017-03-31 00:31:40 +09:00
syuilo
c518401f53 Bye bye polyfill 2017-03-31 00:31:39 +09:00
syuilo
af03db6ae6 [Client] ✌️ 2017-03-30 06:45:43 +09:00
syuilo
0b0d6d2ba4 Update Misskey icon 🎨 2017-03-30 06:43:05 +09:00
Aya Morisawa
0e550aac60 Enhance birthday textbox 2017-03-29 22:03:23 +09:00
Aya Morisawa
efceb1ab26 Enhance profile widget 2017-03-29 21:58:26 +09:00
syuilo
9066052d36 [Client] Better language detection 2017-03-27 04:49:31 +09:00
syuilo
692bd515e3 Clean up 2017-03-27 04:39:46 +09:00
Aya Morisawa
66fbc9a33c Fix #331 2017-03-27 01:42:43 +09:00
syuilo
55dec67dc5 [Client] Remove wrong attributes 2017-03-26 22:04:02 +09:00
syuilo
5b5ceabbf1 l10n 2017-03-26 17:43:25 +09:00
syuilo
79577c9ebb l10n 2017-03-26 17:34:15 +09:00
syuilo
93086fefc5 l10n 2017-03-26 06:58:29 +09:00
syuilo
9ec4a760fd l10n 2017-03-26 06:47:39 +09:00
syuilo
cf2541a22e l10n 2017-03-26 06:26:08 +09:00
syuilo
7dd709f8a6 wip #313 2017-03-26 03:23:19 +09:00
syuilo
b2587a192a [Client:Desktop] Add link 2017-03-26 02:29:52 +09:00
syuilo
b0c12d09e3 [Client:Desktop] Fix bug 2017-03-25 23:52:49 +09:00
syuilo
17677e00f2 [Client:Desktop] Fix bug 2017-03-25 23:47:27 +09:00
syuilo
a501a3cbc4 #322 2017-03-25 23:23:22 +09:00
syuilo
21c472d35b [Client:Desktop] 🎨 2017-03-25 22:48:46 +09:00
syuilo
34e9a8a77e wip #313 2017-03-25 21:25:57 +09:00
ha-dai
4b07d3747c Fix typo. 2017-03-25 21:14:38 +09:00
syuilo⭐️
524c0511a0 Update view.pug 2017-03-25 17:26:42 +09:00
syuilo
0bab5ce27d [Client] Fix bug 2017-03-25 17:09:44 +09:00
syuilo
caf9457653 #321 2017-03-25 16:43:55 +09:00
syuilo
dbafa13d94 Improve readability 2017-03-25 16:35:09 +09:00
syuilo
ed4a7ebd0c [Client:Mobile] 🎨 2017-03-25 16:18:05 +09:00
syuilo
ab8423e2b9 [Client:Desktop] Fix bug 2017-03-25 16:06:11 +09:00
syuilo
afbdc7ee92 [Client:Mobile] ✌️ 2017-03-25 16:01:36 +09:00
syuilo
502637116d wip #313 2017-03-24 03:01:09 +09:00
syuilo
50e65d292c Refactoring 2017-03-23 19:00:04 +09:00
syuilo
d850b157f4 wip #313 2017-03-23 06:31:46 +09:00
syuilo
abb8e021ba wip #313 2017-03-23 05:53:09 +09:00
syuilo
b646877e8b #309 and some cleanups 2017-03-22 16:19:32 +09:00
syuilo
5306bb518d [Client] Fix design 2017-03-22 16:07:44 +09:00
syuilo
b1465e346a [Client] Dark header 2017-03-22 14:13:15 +09:00
syuilo
57dc370a19 [Client:Mobile] 🎨 2017-03-22 14:13:15 +09:00
syuilo
1735de3ff9 [Client:Mobile] 🎨 2017-03-22 14:13:15 +09:00
syuilo
5d7aa3491c [Client] Improve message 2017-03-22 14:13:14 +09:00
syuilo
6665233c00 [Client] 🎨 2017-03-22 01:00:17 +09:00
syuilo
2180489932 [Client:Desktop] Better animation 2017-03-21 21:38:08 +09:00
syuilo
99b16d056b [Client] Fix bug 2017-03-21 18:26:11 +09:00
syuilo
3d4e3c1e88 [Clinet:Desktop] (Design) Fix bug 2017-03-21 18:15:21 +09:00
syuilo
48386a8f68 [Client] Implement streaming buffering 2017-03-21 18:14:59 +09:00
syuilo
4968efe101 [Client] 🎨 2017-03-21 02:10:21 +09:00
syuilo
4d73cd5188 [Client] Fix bug 2017-03-20 23:18:01 +09:00
syuilo
39f13db486 [Client] 🎨 2017-03-20 19:13:37 +09:00
syuilo
9996603e15 #299 Use Anime instead of Velocity 2017-03-20 18:43:04 +09:00
syuilo
5d023178be [Client] Fix bug 2017-03-20 14:53:52 +09:00
syuilo
b6475958d0 [Client] Refactoring 2017-03-20 14:49:24 +09:00
syuilo
de5dc87cec [Client] Fix bug, some refactorings 2017-03-20 14:35:00 +09:00
syuilo
7eeb9c4962 [Client] Fix bugs 2017-03-20 14:24:23 +09:00
syuilo
0610acbf6e #302 2017-03-20 13:55:04 +09:00
syuilo
f48dc504ec [Client] Fix bug 2017-03-20 05:54:41 +09:00
syuilo
95440dffb5 [Client] 良い感じに 2017-03-20 05:43:27 +09:00
syuilo
0390820f07 [Client] 良い感じに 2017-03-20 05:13:13 +09:00
syuilo
b05bee58d2 #298 2017-03-20 04:24:19 +09:00
syuilo
516d3d600a [Client] 🎨 2017-03-20 03:35:52 +09:00
syuilo
9b6f5302ec [Client:Desktop] Fix bug 2017-03-19 20:50:25 +09:00
syuilo⭐️
af88d2c47e Update drive.tag 2017-03-19 18:26:40 +09:00
syuilo
e8e220b410 [API] Fix bug, rename param set -> data (BREAKING) 2017-03-19 15:47:36 +09:00
syuilo
135f0818d6 [Client:Desktop] Fix bug 2017-03-19 15:26:05 +09:00
syuilo
c072232e67 [Client] Follow api changes and some improvements 2017-03-19 15:23:52 +09:00
syuilo
898daf24d1 [Client] Follow api changes and some cleanups 2017-03-19 15:22:55 +09:00
syuilo⭐️
afc06f255a Update drive.tag 2017-03-19 06:47:59 +09:00
syuilo⭐️
7fc0555684 Update drive.tag 2017-03-19 01:16:55 +09:00
syuilo
d21546071e [Client] Fix bug 2017-03-19 00:46:03 +09:00
syuilo
d4f6bf8a7b [Client] Better chart 2017-03-19 00:45:52 +09:00
syuilo
e6d293af57 [Client] ホームカスタマイズ機構ができるまではホームの配置を強制 2017-03-19 00:24:43 +09:00
syuilo
c7cec1f853 [Client] #7 2017-03-19 00:24:07 +09:00
syuilo
89fd8b3940 [Client:Mobile] ✌️ 2017-03-19 00:02:45 +09:00
syuilo
895aeb12c6 [Client] 🎨 2017-03-19 00:01:49 +09:00
syuilo⭐️
c79d490ec9 Update post-detail.tag 2017-03-18 21:01:01 +09:00
syuilo
45e8331e26 🍣 
Closes #12, #227 and #58
 2017-03-18 20:05:11 +09:00
ha-dai
a1cf958940 Open with new tab. 2017-03-18 04:25:58 +09:00
syuilo
b73eb710e4 Clean up 2017-03-18 02:24:14 +09:00
syuilo
bc3006f3c4 #277 2017-03-18 01:16:32 +09:00
syuilo
5ad77e8a3a nanka iroiro 2017-03-18 00:02:53 +09:00
syuilo⭐️
e583ffb771 [Client:Mobile] ルートにフォルダを移動できない問題を修正 2017-03-16 15:42:50 +09:00
syuilo⭐️
0caf1bab09 Fix bug 2017-03-14 10:32:31 +09:00
syuilo
43ae1d59c7 [Client] Improve usability 2017-03-14 09:05:30 +09:00
syuilo
c26a6cfc37 [Client] Fix bug 2017-03-14 07:05:59 +09:00
syuilo⭐️
585b4ec89d [Client] Fix bug 2017-03-14 06:36:58 +09:00
syuilo
8454bddf28 [Client] ✌️ 2017-03-14 00:12:51 +09:00
syuilo
9a4395f3dc wip #272 2017-03-13 23:33:02 +09:00
syuilo⭐️
24f2b238ba Fix bug 2017-03-13 22:07:14 +09:00
syuilo
6ea17ec4aa [Client:Mobile] ✌️ 2017-03-13 16:33:18 +09:00
syuilo
144576a577 [Client:Mobile] 詳細な時間を確認できるように 2017-03-13 16:33:09 +09:00
syuilo
edce96a699 [Client] ✌️ 2017-03-13 16:18:56 +09:00
syuilo
3dd3d06b19 [Client] ✌️ 2017-03-13 14:56:53 +09:00
syuilo
a26236cade [Client] ✌️ 2017-03-13 14:23:29 +09:00
syuilo⭐️
84c4c1d9f6 Fix bug 2017-03-13 06:04:15 +09:00
syuilo
6cc6e0e6f2 [Client:Mobile] ファイルのフォルダ移動を実装 2017-03-12 19:27:54 +09:00
syuilo
bde46c4cff [Client] Better draft management 2017-03-12 07:09:56 +09:00
syuilo
736b972bcb [Client] Fix bug 2017-03-12 07:09:56 +09:00
syuilo⭐️
fe2bd81df7 typo 2017-03-11 19:35:40 +09:00
syuilo
a9c2e25d11 ✌️ 2017-03-11 19:32:49 +09:00
syuilo
34495adbfc [Client] Fix bug 2017-03-11 19:32:12 +09:00
syuilo
08e83e1374 ✌️ 2017-03-11 18:56:15 +09:00
syuilo
ff29e7bb14 #258 2017-03-11 18:47:21 +09:00
syuilo
ae53687b01 [Client] Fix bug 2017-03-11 16:35:07 +09:00
syuilo
31f4d6c0bf Fix #221 2017-03-10 18:12:28 +09:00
syuilo
40ddb9c417 wipo #259 2017-03-10 17:55:04 +09:00
syuilo
0cab127a58 wip #258 2017-03-10 09:30:43 +09:00
syuilo⭐️
8927888174 fix 2017-03-10 02:09:18 +09:00
otofune
e84b1382e6 [client] tags > ui (header) nav: MisskeyTV™ -> ライブ 2017-03-02 17:20:39 +00:00
Aya Morisawa
ac8eb94a27 Use any instead of Object 2017-03-01 17:37:01 +09:00
syuilo⭐️
763a718600 [Client] Fix bug 2017-03-01 16:29:30 +09:00
syuilo⭐️
e217f18ba6 [Client] Fix bug 2017-03-01 16:28:26 +09:00
syuilo
df3440633a Clean up: Destroy nyaize 2017-03-01 14:34:26 +09:00
syuilo
572a38ad67 より良い方法が思いつくまで<i>で代用 2017-03-01 14:32:18 +09:00
syuilo
9c7c7a956c Add nice comment 2017-03-01 14:22:56 +09:00
syuilo
03bab95a1f [Client] Trim text 2017-03-01 14:22:29 +09:00
syuilo
425b3cffdc Use arrow function 2017-03-01 14:19:59 +09:00
syuilo
4253f9e083 Clean up 2017-03-01 14:18:46 +09:00
syuilo⭐️
96f75842de Merge pull request #216 from armchair-philosophy/emoji 
support emoji
 2017-03-01 13:26:19 +09:00
otofune
67ea1498ff [common] text & [web] common > scripts > text compiler: support emoji 2017-03-01 03:19:24 +00:00
otofune
c49c9f16f5 [client] entrance -> public timeline: use nested tag 2017-03-01 02:51:32 +00:00
otofune
d1b1113857 [client] entrance -> public timeline: show processed posts (WIP) 
TODO
* use nested tag for rendering correctly
 2017-03-01 02:48:06 +00:00
ha-dai
51b2f1311a Add link. 2017-02-28 20:03:13 +09:00
syuilo
45fc08e015 [Client] 🎨 2017-02-28 19:41:41 +09:00
Aya Morisawa
b7d422ff12 Fix typo: configration -> configuration 2017-02-27 17:39:27 +09:00
Aya Morisawa
94a7d22cb0 Fix typo: ENTORY -> ENTRY 2017-02-27 17:39:27 +09:00
Aya Morisawa
a66329db89 Fix typo: controll -> control 2017-02-27 17:39:27 +09:00
Aya Morisawa
10929c9445 Fix typo: ialog -> Dialog 2017-02-27 17:39:26 +09:00
Aya Morisawa
2a3e6c13e5 Fix typo: skiped -> skipped 2017-02-27 17:39:26 +09:00
Aya Morisawa
68e7e70dbf Fix typo: uplaod -> upload 2017-02-27 17:39:26 +09:00
Aya Morisawa
1efa9f8ad7 Remove consecutive lines 2017-02-27 17:39:26 +09:00
Aya Morisawa
87fb079e5b Fix typo: trimed -> trimmed 2017-02-27 17:39:26 +09:00
Aya Morisawa
871a461fb1 Fix typo: heigth -> height 2017-02-27 17:39:25 +09:00
syuilo
9ac9ff1800 良い感じに 2017-02-27 16:51:08 +09:00
syuilo
134be39d38 Clean up ✨ 2017-02-27 02:51:38 +09:00
syuilo
f565122c4c [Client] Fix design 2017-02-27 01:54:48 +09:00
syuilo
d1a1bb6351 [Client] Improe rearbilr 2017-02-26 18:02:38 +09:00
syuilo
ff054fb65d [Client] Fix bug 2017-02-26 17:58:48 +09:00
syuilo
4730139dc7 [Client] Fix bug 2017-02-26 17:38:50 +09:00
syuilo
b3b0f780f2 [Client] Implement more file fetching and some refactors 2017-02-26 17:36:54 +09:00
syuilo
1d860acc06 [Client] Fix bug 2017-02-26 17:27:34 +09:00
syuilo
f5d2a07ffa [Client] Fix design 2017-02-26 17:15:18 +09:00
syuilo
8cee464cef [Client] Fix design 2017-02-25 17:09:02 +09:00
syuilo
0c33053fcf [Client] Implement copy file url to clipboard 2017-02-25 16:30:18 +09:00
syuilo
dd9ff67628 [Client] Fix bug 2017-02-25 14:57:17 +09:00
syuilo
e5c09fa11e Improve readaility 2017-02-25 14:54:51 +09:00
syuilo
bc8467cad8 Improve readability 2017-02-25 14:54:17 +09:00
syuilo
8cf95522aa Fix #204 2017-02-25 14:45:43 +09:00
syuilo
c338c1b844 [Client] Fix bug 2017-02-25 13:23:54 +09:00
syuilo
a1ab312c81 [Client] 良い感じに 2017-02-24 18:53:22 +09:00
syuilo
eb783ca256 [Client] 良い感じに 2017-02-24 18:15:19 +09:00
syuilo
231cc1a30c [Client] Refactor: Improve readability 2017-02-24 18:00:39 +09:00
syuilo
de7a4382af [Client] Fix design 2017-02-24 15:39:34 +09:00
syuilo
d5dfbff3c1 [Client] Fix bugh 2017-02-24 11:25:36 +09:00
syuilo
a51b00807b [Client] Fix bug 2017-02-24 01:15:50 +09:00
syuilo
f0776a80fc [Client] Fix bug 2017-02-24 00:18:33 +09:00
syuilo
d3148590f0 [Client] Fix bug 2017-02-23 23:31:28 +09:00
syuilo
9595f43d01 Fix bug 2017-02-23 17:19:52 +09:00
syuilo
d4f245f51c [Client] Fix bug 2017-02-23 17:12:09 +09:00
syuilo
fceb0fa717 [Clikinet] Fix bug 2017-02-22 23:03:22 +09:00
syuilo
3ca03b3fba Refactor 2017-02-22 21:43:38 +09:00
syuilo
f7c0654b9b [Client:Mobile] Better design 2017-02-22 21:36:16 +09:00
syuilo
484f063c01 [Client] Clean up 2017-02-22 21:36:00 +09:00
syuilo⭐️
d99056304a Update timeline-post.tag 2017-02-22 20:32:03 +09:00
syuilo⭐️
2c78f49704 Update uploader.tag 2017-02-22 19:29:29 +09:00
syuilo⭐️
c6085f7c21 Update post-form.tag 2017-02-22 19:26:44 +09:00
syuilo
48812ad2e0 [Client] Fix bug 2017-02-22 17:10:58 +09:00
syuilo
4a44cfa472 [Client] Fiz bug 2017-02-22 16:35:58 +09:00
syuilo
a997e0f754 [Client] Fix bug 2017-02-22 16:32:46 +09:00
syuilo
db40d76690 [Client] Update design 2017-02-22 16:32:38 +09:00
syuilo
a92985122e [Client] Fix bug 2017-02-22 16:03:34 +09:00
syuilo
151f1fe3f7 [Client] Fix design 2017-02-22 13:30:19 +09:00
syuilo
3175706086 [Client] Fix bug 2017-02-22 13:22:24 +09:00
syuilo
d2182c1705 [Client] Fix bug: Add missing config property (url) 2017-02-22 13:11:29 +09:00
syuilo
f2c5dc468c Extract user's profile 2017-02-22 12:43:15 +09:00
syuilo
da346a685e [Client] Clean up: Remove the needless config property 2017-02-22 04:25:16 +09:00
syuilo
9820a691c1 well done 2017-02-22 04:19:53 +09:00
syuilo
15b237875b Clean up 2017-02-22 03:27:38 +09:00
syuilo
d9703eab67 Clean up 2017-02-22 03:13:19 +09:00
syuilo
f0b0718932 Fix bugs 2017-02-22 02:05:44 +09:00
syuilo
1f3e128ed5 Fix 2017-02-22 01:20:57 +09:00
syuilo
2a1fab34df wip 2017-02-22 01:05:23 +09:00
syuilo
65d03dc9da wip 2017-02-21 23:46:37 +09:00
syuilo⭐️
0350673862 Update user.tag 2017-02-21 21:51:58 +09:00
syuilo⭐️
030dbbc2eb Update user-profile.tag 2017-02-21 21:48:00 +09:00
syuilo
2de118a45d wip 2017-02-21 20:34:54 +09:00
syuilo
8647c1d71c wip 2017-02-21 20:05:03 +09:00
syuilo
2a9d9643aa wip 2017-02-21 19:10:07 +09:00
syuilo
8fd6f24ee6 wip 2017-02-21 18:36:43 +09:00
syuilo
e8378c2bb8 wip 2017-02-21 17:52:10 +09:00
syuilo
3ea73a888d wip 2017-02-21 11:44:53 +09:00
syuilo
7921d3508a wip 2017-02-21 09:59:53 +09:00
syuilo
ea512a14b5 wip 2017-02-21 09:52:59 +09:00
syuilo
b0898e7151 Merge branch 'no-tag-ls' of https://github.com/syuilo/misskey into no-tag-ls 2017-02-21 09:49:40 +09:00
syuilo
b66bac7851 wip 2017-02-21 09:49:35 +09:00
syuilo⭐️
2f840733d7 Update window.tag 2017-02-21 01:13:24 +09:00
syuilo
c5a26efda4 wip 2017-02-21 01:02:32 +09:00
syuilo
beb04e918e wip 2017-02-21 00:44:18 +09:00
syuilo
47ec35f81b Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls 2017-02-20 20:27:51 +09:00
syuilo
2d2d612c60 [Client] Use strict 2017-02-20 20:21:28 +09:00
syuilo
2a3a5d4b50 wip 2017-02-20 20:13:42 +09:00
syuilo
3a39a36bed wip 2017-02-20 16:27:24 +09:00
syuilo
c05abf4da7 wip 2017-02-20 16:09:46 +09:00
syuilo
4c43573c1e wip 2017-02-20 14:55:20 +09:00
syuilo
b0c1ec3124 wip 2017-02-20 14:51:19 +09:00
syuilo
02be6a08f9 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
 2017-02-20 14:43:01 +09:00