Commit graph

464 commits

Author SHA1 Message Date
Shpuld Shpludson 92380652fe Merge branch 'feat/conversation-muting' into 'develop'
Add Conversation/Thread Muting

See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
Lee Starnes 4fc27414d2 Handle JSONified errors while registering
Closes #617
2019-08-06 18:03:31 +00:00
taehoon 876c6de806 fix typos 2019-07-24 21:02:37 -04:00
Shpuld Shpludson 3370dd80dc Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij 69a4bcb238 New search 2019-07-15 16:42:27 +00:00
taehoon 670cbfdd1c change subscribing to subscribed 2019-07-10 21:01:07 -04:00
taehoon 646d197bf1 mutate updated relationship to the store 2019-07-10 21:01:07 -04:00
jared d5e8315e83 #482 - add subscribe button 2019-07-10 21:01:07 -04:00
Tae Hoon 532b76eb64 Refactor user search api, better api error response handling 2019-07-10 16:58:49 +00:00
taehoon ab4d7d9616 refetch favs and repeats separately 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
shpuld 7ed9d17ce7 Add thread muting to context menu of status 2019-07-07 23:02:09 +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
Henry Jameson 020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
HJ 8f53796420 Merge branch 'develop' into 'eslint-fix'
# Conflicts:
#   src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00
Henry Jameson 2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
taehoon 0e9b8be88c clear userId property of timeline by default in clearTimeline action 2019-07-02 14:32:46 -04:00
Egor Kislitsyn 52319acf58 Revoke oAuth token 2019-07-02 15:33:40 +07:00
HJ bb8e2b1933 Merge branch 'timeline-skip-fix' into 'develop'
timeline-skip-fix

See merge request pleroma/pleroma-fe!850
2019-06-24 22:08:09 +00:00
Wyatt Benno 7a5d06a6cf change isPinned to noIdUpdate 2019-06-24 12:01:13 +09:00
Shpuld Shpludson 947f69a953 Fix: problems with polls state 2019-06-22 14:01:36 +00:00
Wyatt Benno a1c50c3fc1 fix for #553 2019-06-21 10:31:00 +09:00
taehoon bd377148ad delete state.token instead of setting false 2019-06-20 11:48:31 -04:00
taehoon c23228f196 fix error breaking logout flow 2019-06-20 11:48:30 -04:00
taehoon 268e9ce504 make sure to clear old token when logout 2019-06-20 11:48:29 -04:00
Shpuld Shpludson e5e9bb27f3 Move poll state handling to its own module 2019-06-20 13:02:04 +00:00
lain 0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Henry Jameson de03eda9f3 fix user search 2019-06-17 23:39:30 +03:00
Henry Jameson e3638af031 Removed formattingOptionsEnabled in favor of relying on BE-provided list of
accepted formatting options
2019-06-16 20:16:52 +03:00
Henry Jameson acbeea59ff rename mutations according to actual property names 2019-06-13 10:11:17 +03:00
Henry Jameson dba8d8910c fix 2019-06-13 10:00:06 +03:00
Henry Jameson d551b39859 fix logged out post-update 2019-06-13 09:48:43 +03:00
Henry Jameson c8a57ad32e Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
* upstream/develop:
  Revert "add TOTP/Recovery Form for mobile version"
2019-06-13 00:51:14 +03:00
Henry Jameson 6cd4546873 comments 2019-06-13 00:44:25 +03:00
Henry Jameson af75c6d1ea No longer sending extra data, renamed some properties 2019-06-13 00:39:51 +03:00
Maksim 77eceedbf7 Revert "add TOTP/Recovery Form for mobile version"
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
Henry Jameson e7a2a7267d Proper clientId/secret/token caching, MastoAPI registration 2019-05-22 19:13:41 +03:00
taehoon 110c9d3b26 improve performance by caching pinned status ids into user object 2019-05-15 12:04:26 -04:00
taehoon f8186bfc74 show immediately pinned statuses 2019-05-15 12:04:26 -04:00
taehoon 8308315038 revert removeStatus changes 2019-05-15 12:04:26 -04:00
taehoon 1229622fed refactor error handling of pinStatus 2019-05-15 12:04:25 -04:00
taehoon ce1d19136d refactor pin/unpin status logic 2019-05-15 12:04:25 -04:00
taehoon e8abe1273b filter pinned statuses based on pinned entity instead of a separate user entity 2019-05-15 12:04:25 -04:00
taehoon cd0a7afa06 remove pinned timeline, instead, use simple entity of user object 2019-05-15 12:04:25 -04:00
dave e6268c492e #468 - clean up 2019-05-15 12:04:25 -04:00
dave df207593e9 #468 - update pinned status after actions(remove, add) 2019-05-15 12:04:24 -04:00
dave f1ff48ffd6 #468 - remove unpinned status from timeline 2019-05-15 12:04:24 -04:00
dave 2c89d49a3d #468 - show pinned timeline and add pinned label to the status 2019-05-15 12:04:24 -04:00
dave 1aa0e8d7e0 #468 - pin/unpin status 2019-05-15 12:04:24 -04:00