Commit graph

167 commits

Author SHA1 Message Date
Shpuld Shpludson 662afe973a Fix #750 , fix error messages and captcha resetting 2020-01-14 13:45:00 +00:00
HJ 215662afde Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
#   static/fontello.json
2020-01-03 09:05:48 +00:00
Henry Jameson b619477573 Merge remote-tracking branch 'upstream/develop' into streaming
* upstream/develop: (51 commits)
  toggle_activation api is also deprecated
  use vuex action
  refactor toggleActivationStatus
  replace setActivationStatus api with new one
  use flex for stickers
  i18n/update-ja_easy
  Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
  Add fallback in case BE does not report federating status in nodeinfo
  The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
  Logic should be to hide TWKN if not federating OR if instance is not public
  Finally trust eslint
  More lint
  More lint
  Lint
  mfa: removed unused code
  increase icon width a little bit in the nav panel
  add icons to nav panel
  Revert "Merge branch 'revert-96cab6d8' into 'develop'"
  Support "native" captcha
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
  ...
2019-12-26 12:47:51 +02:00
taehoon 4e4c4af422 toggle_activation api is also deprecated 2019-12-15 14:32:04 -05:00
taehoon 36376ce57c use vuex action 2019-12-15 14:32:04 -05:00
Henry Jameson 585702b1ce fix desktop notifications not working with streaming 2019-12-12 18:53:36 +02:00
kPherox c3e7806acb
remove unused fallback 2019-12-11 18:48:18 +09:00
Henry Jameson 6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00
Henry Jameson ff95d865d2 Updated streaming and improved error-handling, some more refactoring to api 2019-12-08 16:05:41 +02:00
Henry Jameson 172ebaf4e6 improved initial notifications fetching 2019-11-24 22:01:12 +02:00
Henry Jameson 319bb4ac28 initial streaming work 2019-11-24 18:50:28 +02:00
Henry Jameson ddb6fb9217 Backend Interactor service overhaul, removed the need for copypasting 2019-11-24 13:57:46 +02:00
kPherox 0995658757 backend interactor service: implement startFetchingFollowRequest
backend interactor service: remove unused fetchFollowRequests
2019-11-19 14:07:15 +00:00
Henry Jameson 0dcb696e26 Merge remote-tracking branch 'upstream/develop' into emoji-optimizations
* upstream/develop: (95 commits)
  Lightbox/modal multi image improvements - #381
  '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
  Add ability to change user's email
  translations-de-batch-1
  eu-translate update
  profile-banner rounding css, fixes #690
  fix indentation
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  ...
2019-11-08 19:48:31 +02:00
Henry Jameson c000879f2f moved emoji fetching from user to instance since it's its state anyway 2019-10-09 22:50:00 +03:00
Henry Jameson 91ca1db778 moved emoji stuff away from after-store and into users module since we only need
emoji after login
2019-10-08 21:38:27 +03:00
Maksim Pechnikov 8721fb57fc added support hide\show reblogs from a specific user 2019-09-21 16:24:47 +03:00
taehoon 13b80b5c7c rename a mutation 2019-09-01 13:07:43 -04:00
Sergey Suprunenko d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +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
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
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
Henry Jameson 020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
Henry Jameson 2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
Egor Kislitsyn 52319acf58 Revoke oAuth token 2019-07-02 15:33:40 +07:00
taehoon 268e9ce504 make sure to clear old token when logout 2019-06-20 11:48:29 -04:00
Henry Jameson de03eda9f3 fix user search 2019-06-17 23:39:30 +03: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 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
taehoon f2f3fa81d8 refer searched user objects from the global user rep 2019-04-22 11:17:01 -04:00
taehoon 992c8e1f77 stop fetching user relationship when user is unauthorized 2019-04-17 22:47:56 -04:00
taehoon d3cad54aa3 add bulk mute/unmute buttons and wire up to vuex 2019-04-17 11:32:49 -04:00
taehoon 13c8f10f4b wire up bulk action buttons to vuex 2019-04-17 11:32:49 -04:00
Shpuld Shpludson 55410c91fa Merge branch '489' into 'develop'
Fix Blocked status inconsistency between Blocks setting tab and Following profile tab

Closes #489

See merge request pleroma/pleroma-fe!751
2019-04-15 19:58:15 +00:00
taehoon 948baba9d3 add muted user to the mutes list in real time 2019-04-14 23:44:50 -04:00
taehoon 5c2c222252 add blocked user to the blocked list on real time 2019-04-14 23:44:49 -04:00
taehoon 69f9ea987c make blocking functional in the search results 2019-04-14 23:44:49 -04:00
taehoon e7010d73ac store friends/followers in the global user repository 2019-04-14 23:41:38 -04:00
Brenden Bice 41845389a9 display no message on empty data fetched from api 2019-04-12 23:12:22 -04:00
Brenden Bice 2ae0507575 remove error message on no more following 2019-04-12 23:09:05 -04:00
dave d498a26af5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-09 15:42:05 -04:00
Shpuld Shpludson 1e9ddcb0da Merge branch 'fix/notification-bugs' into 'develop'
#474 Fix notification bugs

Closes #474

See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave d3218807b4 #436 - merge develop 2019-04-08 21:04:59 -04:00
jasper a1275be4c0 Separate timeline and notification 2019-04-04 09:03:56 -07:00