Commit graph

2289 commits

Author SHA1 Message Date
syuilo
7495206db2
Merge branch 'develop' 2019-04-25 07:48:29 +09:00
syuilo
0db54386cd
Resolve #3119 2019-04-25 07:46:39 +09:00
syuilo
772258b0b8
Fix #4793 2019-04-25 04:32:01 +09:00
syuilo
3ef002e14d
Fix bug 2019-04-25 04:27:34 +09:00
syuilo
b90d473ae5
Fix layout 2019-04-25 04:26:58 +09:00
syuilo
afe2037985
Merge branch 'develop' 2019-04-24 20:51:34 +09:00
syuilo
e8c8f67a09
Update post-form.vue
Close #4792

Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
2019-04-24 20:47:47 +09:00
syuilo
7b29e7cf7e
Fix bug 2019-04-24 20:41:32 +09:00
syuilo
723d3e6871
Merge branch 'develop' 2019-04-24 15:23:48 +09:00
syuilo
64d00b08a3
Improve announcement
* お知らせにMFMを使えるように
* お知らせに画像を添付できるように
2019-04-24 15:21:39 +09:00
syuilo
4f20ee1909
Rename theme 2019-04-24 14:44:28 +09:00
syuilo
8555ec2f72
Fix #4767 2019-04-24 10:02:31 +09:00
syuilo
0463c6bb0f
Refactor API (#4770)
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update description.ts

* wip
2019-04-23 22:35:26 +09:00
syuilo
7b44727b23
Merge branch 'develop' 2019-04-18 22:01:45 +09:00
syuilo
fda8cf77ed
Improve warp 2019-04-18 22:00:11 +09:00
syuilo
8aaab195c6
Fix bug 2019-04-18 21:40:36 +09:00
syuilo
4096ddcbd0
Use - 2019-04-18 21:36:44 +09:00
syuilo
ae6cc11ad2
Fix icon 2019-04-18 21:34:56 +09:00
tamaina
dab7e527de Improve user lists index (#4605)
* wip

* Revert "wip"

This reverts commit 6212831ce3bdae5ce17f8ace9945710ba7696185.

* improve list index

* Update user-lists.vue
2019-04-18 21:33:24 +09:00
syuilo
8b92feac71
Resolve #4732 2019-04-18 21:29:19 +09:00
syuilo
55f63229cd
Update timemachine.vue 2019-04-18 19:42:40 +09:00
syuilo
7827aeb695
Resolve #4735 2019-04-18 19:40:23 +09:00
MeiMei
653b8f6352 スプラッシュがクリックに反応するように (#4561)
* confirm silence

* Resolve #4554

* Revert "confirm silence"

This reverts commit e1dbdc2bfc0f41c2b308b142c70e9e4573c98cf9.
2019-04-18 03:37:49 +09:00
MeiMei
9ec6afa375 confirm on user menu (#4553) 2019-04-18 03:36:06 +09:00
MeiMei
adff5382ca confirm silence (#4560) 2019-04-18 03:33:51 +09:00
tamaina
704aabd703 Use menu instead of prompt Fix #4540, Fix #342 (#4575)
* Use menu instead prompt

* fix

* https://bit.ly/2U0JuVt

* fix
2019-04-18 03:32:45 +09:00
MeiMei
f7b1ef0690 アンケートウィジットでもMFMを使用するように v11 (#4741)
* MFM in poll

* use mfm
2019-04-18 03:14:04 +09:00
syuilo
611e4f34dc
Merge branch 'develop' 2019-04-17 19:37:32 +09:00
syuilo
5eec896615
Better avgColor 2019-04-17 17:13:49 +09:00
syuilo
17f35174ea
🎨 2019-04-17 17:01:57 +09:00
syuilo
9399a44c82
Fix error 2019-04-17 16:50:50 +09:00
syuilo
85959a3b9b
Fix #4721 Fix #4722 2019-04-17 14:30:31 +09:00
syuilo
946c3a25b9
Clean up 2019-04-17 07:25:34 +09:00
syuilo
532ef744f4
Merge branch 'develop' 2019-04-17 02:58:09 +09:00
MeiMei
b186504718 Metaのアクセスでトランザクションを張るように (#4720)
* admin/instanceでmetaをキャッシュしないように

* Metaのアクセスにトランザクションをかける
2019-04-17 00:45:33 +09:00
Satsuki Yanagi
85d29a3f9d Correct syntax error (#4718) 2019-04-17 00:30:34 +09:00
tamaina
4db22e45a2 fix syuilo#4711 (#4715) 2019-04-16 13:05:47 +09:00
tamaina
f966d0b32c 色々な修正; Fix #4709 (#4714)
* Fix a la carte 1

* use dialog instead of alert() etc
2019-04-16 13:05:10 +09:00
MeiMei
ba3879a95a Fix: admin/driveのアイコンがずれてる (#4710) 2019-04-16 02:46:47 +09:00
syuilo
ff625253ce
Merge branch 'develop' 2019-04-15 22:09:10 +09:00
syuilo
77ff7b9df0
デフォルトでHTLを表示するように 2019-04-15 21:30:49 +09:00
syuilo
7abfcd06da
Merge branch 'develop' 2019-04-15 21:02:04 +09:00
syuilo
08221fdda7
Fix bug 2019-04-15 20:41:56 +09:00
syuilo
d040dc19bc
Merge branch 'develop' 2019-04-15 12:23:20 +09:00
syuilo
772063aade
Refactor 2019-04-15 12:20:48 +09:00
tamaina
94f8a145ec Better permisson Fix #2341 (#4611)
* Better permisson Fix #2341

* add kinds.ts

* test

* fix

* v11

* fix
2019-04-15 12:10:40 +09:00
syuilo
b357afa30a
Clean up 2019-04-15 12:04:23 +09:00
syuilo
c6eafdde30
Fix bug 2019-04-15 11:59:25 +09:00
syuilo
d66e4b7ff9
Merge branch 'develop' 2019-04-14 20:38:55 +09:00
tamaina
487a3079cd Improve post form attaches; Fix #4673, Resolve #2327, Resolve #2145 [v11] (#4674)
* improve post form attaches

* Fix

* chain

* 右クリックでも反応するように
2019-04-14 17:12:04 +09:00