Commit graph

3304 commits

Author SHA1 Message Date
taehoon
1727c815f8 install v-tooltip 2019-07-15 21:22:40 -04:00
HJ
f734a72116 Merge branch 'fix/respect-hide-post-stats' into 'develop'
Hide favs/rts properly when hide post stats is enabled

See merge request pleroma/pleroma-fe!877
2019-07-15 21:47:45 +00:00
Shpuld Shpludson
e86f6edb7c Merge branch 'patch-2' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!794
2019-07-15 19:21:37 +00:00
Shpuld Shpludson
bfc6f7b3ec Merge branch 'revert-0a7c60c3' into 'develop'
Revert "Merge branch 'csp-header' into 'develop'"

See merge request pleroma/pleroma-fe!880
2019-07-15 19:21:01 +00:00
Shpuld Shpludson
c649e202b3 Merge branch 'i18n/update-pedantic-japanese-traslation' into 'develop'
i18n/Update pedantic Japanese translation

See merge request pleroma/pleroma-fe!882
2019-07-15 19:18:40 +00:00
54b45ec4a3 i18n/Update pedantic Japanese translation 2019-07-15 19:18:40 +00:00
Shpuld Shpludson
34ca0d369f Merge branch 'i18n/update-japanese-trasnlation' into 'develop'
i18n/Update easy Japanese trasnlation

See merge request pleroma/pleroma-fe!878
2019-07-15 19:18:20 +00:00
f665ac83e7 i18n/Update easy Japanese trasnlation 2019-07-15 19:18:20 +00:00
Shpuld Shpludson
e9b452575b Merge branch 'new-search' into 'develop'
New search

See merge request pleroma/pleroma-fe!832
2019-07-15 16:42:27 +00:00
Eugenij
69a4bcb238 New search 2019-07-15 16:42:27 +00:00
HJ
0c06410584 Merge branch '482-subscribe-user' into 'develop'
Implement ability to subscribe to a user

Closes #482

See merge request pleroma/pleroma-fe!771
2019-07-15 06:50:31 +00:00
taehoon
ff90d864cc fix wrong eslint comments 2019-07-12 15:11:54 -04:00
taehoon
78594f61d4 add a todo comment 2019-07-12 15:10:30 -04:00
taehoon
57c5d269b8 add bell-ringing icon 2019-07-11 12:52:05 -04:00
taehoon
b2dbf01a72 eslint —fix 2019-07-10 21:01:08 -04:00
taehoon
9712e324e5 hide subscribe button unless following 2019-07-10 21:01:08 -04:00
taehoon
81d1d30586 revert font change 2019-07-10 21:01:08 -04:00
taehoon
1237d0d2b8 use normal bell for unsubscribed state 2019-07-10 21:01:08 -04:00
taehoon
4f26299bd5 update copy 2019-07-10 21:01:08 -04:00
taehoon
0f4cccd115 improve ui 2019-07-10 21:01:08 -04:00
taehoon
38ba5fe028 change subscribe button to icon button 2019-07-10 21:01:08 -04:00
taehoon
e503243be3 add bell-off font icon 2019-07-10 21:01:08 -04:00
taehoon
2ab00387fe clean up + add btn-group css class 2019-07-10 21:01:07 -04:00
taehoon
e1d6e56e1b clean up layout 2019-07-10 21:01:07 -04:00
taehoon
0fc154d9d4 clean up UserCard css 2019-07-10 21:01:07 -04:00
taehoon
dbe2decc59 clean up UserCard template 2019-07-10 21:01:07 -04:00
taehoon
3b9ab0e343 no need to covert to boolean 2019-07-10 21:01:07 -04:00
taehoon
670cbfdd1c change subscribing to subscribed 2019-07-10 21:01:07 -04:00
taehoon
0c52d69a52 update copy 2019-07-10 21:01:07 -04:00
taehoon
ace3b399ff support i18n 2019-07-10 21:01:07 -04:00
taehoon
deee07d6fb show subscribe button only if user is logged in 2019-07-10 21:01:07 -04:00
taehoon
646d197bf1 mutate updated relationship to the store 2019-07-10 21:01:07 -04:00
taehoon
e9e6daa76e show text in progress only when slot is given 2019-07-10 21:01:07 -04:00
taehoon
f4a16e6541 add subscribing to user entity normalizer 2019-07-10 21:01:07 -04:00
taehoon
4cf402ff21 migrate SubscribeButton to the existing common component 2019-07-10 21:01:07 -04:00
jared
d5e8315e83 #482 - add subscribe button 2019-07-10 21:01:07 -04:00
jared
f2c95f9d0b #482 - add new endpoints to subscribe to the user 2019-07-10 21:01:07 -04:00
114a36c9be Revert "Merge branch 'csp-header' into 'develop'"
This reverts merge request !856
2019-07-10 22:30:32 +00:00
HJ
0a7c60c303 Merge branch 'csp-header' into 'develop'
Add Content-Security-Policy header

See merge request pleroma/pleroma-fe!856
2019-07-10 18:44:27 +00:00
taehoon
34d95454b3 add csp header to dev server 2019-07-10 13:49:53 -04:00
Shpuld Shpludson
cf2dc5b683 Merge branch '582' into 'develop'
Refactor user search api, better api error response handling

See merge request pleroma/pleroma-fe!844
2019-07-10 16:58:49 +00:00
Tae Hoon
532b76eb64 Refactor user search api, better api error response handling 2019-07-10 16:58:49 +00:00
shpuld
59ade4084e Hide favs/rts properly when hide post stats is enabled 2019-07-09 16:50:23 +03:00
HJ
2f87540612 Merge branch '588' into 'develop'
Sync the counters in Favs and Repeats view and near the buttons

Closes #588

See merge request pleroma/pleroma-fe!854
2019-07-09 13:46:06 +00:00
taehoon
0131effb01 add comments 2019-07-07 22:49:18 -04:00
taehoon
ab4d7d9616 refetch favs and repeats separately 2019-07-07 22:49:18 -04:00
taehoon
e9b6e0e2b7 refetch favs and repeats when stats are changed 2019-07-07 22:49:18 -04:00
taehoon
17498ef906 update favs and repeats stats using favoritedByUsers and rebloggedByUsers data 2019-07-07 22:49:18 -04:00
HJ
6b4fe1c2d9 Merge branch 'fix/console-errors-with-reply-filter' into 'develop'
Fix console errors in status.js

See merge request pleroma/pleroma-fe!875
2019-07-07 23:27:46 +00:00
shpuld
e5879e3d4d check for user before checking users props 2019-07-07 22:23:04 +03:00