Commit Graph

4449 Commits

Author SHA1 Message Date
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
feld 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 7ed9d17ce7 Add thread muting to context menu of status 2019-07-07 23:02:09 +03:00
shpuld e5879e3d4d check for user before checking users props 2019-07-07 22:23:04 +03:00
Shpuld Shpludson 54b0f90133 Merge branch 'eslint-fix' into 'develop'
Fix shitton warning eslint gives

See merge request pleroma/pleroma-fe!871
2019-07-07 19:12:33 +00:00
Shpuld Shpludson 171673113f Merge branch 'revoke-token' into 'develop'
Revoke oAuth token on logout

Closes pleroma#952

See merge request pleroma/pleroma-fe!864
2019-07-07 18:29:36 +00:00
Shpuld Shpludson c8794b2b84 Merge branch '580' into 'develop'
Fix backend version string parsing

Closes #580

See merge request pleroma/pleroma-fe!868
2019-07-07 10:30:45 +00:00
Shpuld Shpludson e7ff9b5227 Merge branch '600-2' into 'develop'
Preserve formatting of status content

Closes #600

See merge request pleroma/pleroma-fe!872
2019-07-07 10:21:55 +00:00
Shpuld Shpludson 19b5aea081 Merge branch 'preserve-follows-followers-visibility-settings' into 'develop'
Set hide_follows and hide_followers settings when parsing Mastodon format

See merge request pleroma/pleroma-fe!873
2019-07-07 10:20:55 +00:00
Eugenij 14ec12b4f6 Set hide_follows and hide_followers settings when parsing Mastodon format 2019-07-07 10:20:55 +00:00
Shpuld Shpludson e80ed386be Merge branch 'fix-hmr' into 'develop'
fix hot reload always reloading the page

See merge request pleroma/pleroma-fe!874
2019-07-07 10:20:36 +00:00
Henry Jameson 020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
Henry Jameson 1ec4caa0bb fix merge conflict 2019-07-06 23:52:10 +03:00