Commit Graph

2289 Commits

Author SHA1 Message Date
syuilo
01b08be9a6 Merge branch 'develop' 2019-04-25 07:48:29 +09:00
syuilo
2c885dc8a4 Resolve #3119 2019-04-25 07:46:39 +09:00
syuilo
9372de2d08 Fix #4793 2019-04-25 04:32:01 +09:00
syuilo
9bb906e285 Fix bug 2019-04-25 04:27:34 +09:00
syuilo
2d938718bc Fix layout 2019-04-25 04:26:58 +09:00
syuilo
6ff5157276 Merge branch 'develop' 2019-04-24 20:51:34 +09:00
syuilo
4cac926d04 Update post-form.vue
Close #4792

Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
2019-04-24 20:47:47 +09:00
syuilo
682ca98f0f Fix bug 2019-04-24 20:41:32 +09:00
syuilo
dfebb967b0 Merge branch 'develop' 2019-04-24 15:23:48 +09:00
syuilo
a78d9b6160 Improve announcement
* お知らせにMFMを使えるように
* お知らせに画像を添付できるように
2019-04-24 15:21:39 +09:00
syuilo
f910613861 Rename theme 2019-04-24 14:44:28 +09:00
syuilo
740fc071ac Fix #4767 2019-04-24 10:02:31 +09:00
syuilo
493c83ef2d 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
93a75c8b29 Merge branch 'develop' 2019-04-18 22:01:45 +09:00
syuilo
2f4edd905c Improve warp 2019-04-18 22:00:11 +09:00
syuilo
6f232777f3 Fix bug 2019-04-18 21:40:36 +09:00
syuilo
78c5430bbe Use - 2019-04-18 21:36:44 +09:00
syuilo
0b8dd3e099 Fix icon 2019-04-18 21:34:56 +09:00
tamaina
2877e4843d 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
f16156a4cc Resolve #4732 2019-04-18 21:29:19 +09:00
syuilo
3492b79126 Update timemachine.vue 2019-04-18 19:42:40 +09:00
syuilo
33d1ee922f Resolve #4735 2019-04-18 19:40:23 +09:00
MeiMei
9a8035cad4 スプラッシュがクリックに反応するように (#4561)
* confirm silence

* Resolve #4554

* Revert "confirm silence"

This reverts commit e1dbdc2bfc0f41c2b308b142c70e9e4573c98cf9.
2019-04-18 03:37:49 +09:00
MeiMei
cfee6a38d3 confirm on user menu (#4553) 2019-04-18 03:36:06 +09:00
MeiMei
43f50e0602 confirm silence (#4560) 2019-04-18 03:33:51 +09:00
tamaina
2d79243798 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
567df7c6b2 アンケートウィジットでもMFMを使用するように v11 (#4741)
* MFM in poll

* use mfm
2019-04-18 03:14:04 +09:00
syuilo
110a2a7121 Merge branch 'develop' 2019-04-17 19:37:32 +09:00
syuilo
022bb7a5b3 Better avgColor 2019-04-17 17:13:49 +09:00
syuilo
651c79536f 🎨 2019-04-17 17:01:57 +09:00
syuilo
9f363d253d Fix error 2019-04-17 16:50:50 +09:00
syuilo
ac4fdc0e10 Fix #4721 Fix #4722 2019-04-17 14:30:31 +09:00
syuilo
f11f901d7d Clean up 2019-04-17 07:25:34 +09:00
syuilo
02845dc171 Merge branch 'develop' 2019-04-17 02:58:09 +09:00
MeiMei
135c99591e Metaのアクセスでトランザクションを張るように (#4720)
* admin/instanceでmetaをキャッシュしないように

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

* use dialog instead of alert() etc
2019-04-16 13:05:10 +09:00
MeiMei
5c36a24937 Fix: admin/driveのアイコンがずれてる (#4710) 2019-04-16 02:46:47 +09:00
syuilo
232e5fab2c Merge branch 'develop' 2019-04-15 22:09:10 +09:00
syuilo
da1394f029 デフォルトでHTLを表示するように 2019-04-15 21:30:49 +09:00
syuilo
4ccdc10c5c Merge branch 'develop' 2019-04-15 21:02:04 +09:00
syuilo
efeea7f2b4 Fix bug 2019-04-15 20:41:56 +09:00
syuilo
bdd806d16d Merge branch 'develop' 2019-04-15 12:23:20 +09:00
syuilo
3c2c9fc44b Refactor 2019-04-15 12:20:48 +09:00
tamaina
1c684cbf93 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
95852d5ae9 Clean up 2019-04-15 12:04:23 +09:00
syuilo
75129293c4 Fix bug 2019-04-15 11:59:25 +09:00
syuilo
471ba1d029 Merge branch 'develop' 2019-04-14 20:38:55 +09:00
tamaina
3f17bfbd26 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