Commit graph

593 commits

Author SHA1 Message Date
kPherox a06f3a7fbc
Add with_move param for fetching notification 2020-02-04 04:54:36 +09:00
kPherox 9bbf10b55d
Add setting for allow_following_move 2020-02-04 04:54:28 +09:00
Shpuld Shpuldson 6afff4f8c2 review changes 2020-01-28 17:09:25 +02:00
Shpuld Shpuldson e6291e4ee1 remove unnecessary anonymous function 2020-01-27 18:43:26 +02:00
Shpuld Shpuldson c4beac5f89 Merge branch 'develop' into feat/emoji-reactions 2020-01-26 15:59:59 +02:00
Shpuld Shpuldson 7cfe1b05e8 remove mock data 2020-01-26 15:57:40 +02:00
Shpuld Shpuldson a018ea622c change emoji reactions to use new format 2020-01-26 15:45:12 +02:00
lain 8080981fcd Fix follower request fetching 2020-01-21 16:51:49 +01:00
Shpuld Shpludson 7a013ac393 Implement domain mutes v2 2020-01-15 20:22:54 +00:00
Shpuld Shpludson 662afe973a Fix #750 , fix error messages and captcha resetting 2020-01-14 13:45:00 +00:00
Shpuld Shpludson 86380f0429 Optimize Notifications Rendering 2020-01-14 13:28:57 +00:00
Shpuld Shpuldson 910b82e231 Use last seen notif instead of first unseen notif for sinceId 2020-01-14 11:13:59 +02:00
Shpuld Shpuldson b32888194c fix merge conflicts 2020-01-13 23:47:32 +02:00
Shpuld Shpuldson 33abbed5a1 usable-but-buggy: picker, adding/removing reaction on click, search, styles 2020-01-13 23:34:39 +02: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 45e7f93c49 refactor toggleActivationStatus 2019-12-15 14:32:04 -05:00
taehoon 506822bed0 replace setActivationStatus api with new one 2019-12-15 14:32:04 -05:00
HJ c1a0e23947 Merge branch 'revert-c2c48ec2' into 'develop'
Reinstate `push` and `admin` scopes

See merge request pleroma/pleroma-fe!1034
2019-12-14 14:12:41 +00:00
feld 749a399944 Merge branch 'issue_124' into 'develop'
Change 403 messaging

See merge request pleroma/pleroma-fe!1020
2019-12-13 17:02:09 +00:00
HJ 9789123b1c Merge branch 'mfa/login_form' into 'develop'
mfa: fix login and recovery form

See merge request pleroma/pleroma-fe!1031
2019-12-13 10:18:50 +00:00
Ivan Tashkinov 341416b0e0 Revert "Merge branch 'revert-96cab6d8' into 'develop'"
This reverts merge request !1032
2019-12-12 14:43:48 +00:00
lain b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
This reverts merge request !1024
2019-12-12 09:38:24 +00:00
Maksim Pechnikov f70fe28f64 mfa: fix login and recovery form 2019-12-12 08:42:21 +03:00
Henry Jameson 63a5f50e7c fix deletes causing errors 2019-12-11 18:20:43 +02:00
Maksim Pechnikov d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
Henry Jameson 6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00
kPherox 6af870cd90
Add view for moves notifications 2019-12-11 00:00:45 +09:00
kPherox 2bc63720a5
fix parse for move type notifications 2019-12-11 00:00:36 +09:00
Wyatt Benno 8ee8033955 Set error data 2019-12-09 10:31:57 +09:00
Wyatt Benno 1a043d4350 remove console 2019-12-09 09:11:31 +09:00
Wyatt Benno e86af0c965 Change naming, make more general 2019-12-09 09:02:34 +09:00
Henry Jameson 505fb26061 better wrapper for websocket 2019-12-08 19:18:38 +02:00
Henry Jameson ff95d865d2 Updated streaming and improved error-handling, some more refactoring to api 2019-12-08 16:05:41 +02:00
Ivan Tashkinov a06705d939 Added OAuth 'push' and 'admin' scopes. 2019-12-08 13:52:26 +03:00
Wyatt Benno 01855f315c Wording updates 2019-12-06 09:38:55 +09:00
Wyatt Benno 13fc2612ae Change 403 messaging 2019-12-05 11:48:37 +09: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
HJ 0eda60eeb4 Merge branch 'greentext-strikes-back' into 'develop'
⑨ Added greentext support ⑨

Closes #9

See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00
kPherox a55486f8d7 Normalize profile fields 2019-11-19 14:15:41 +00:00
kPherox 0995658757 backend interactor service: implement startFetchingFollowRequest
backend interactor service: remove unused fetchFollowRequests
2019-11-19 14:07:15 +00:00
Shpuld Shpuldson d007502629 add fetching for emoji reactions, draft design 2019-11-15 08:39:21 +02:00
Henry Jameson bd2a682b83 tests + updates 2019-11-14 22:40:20 +02:00
Henry Jameson 692ee0e95a Fix regex, tag detector condition 2019-11-14 00:41:14 +02:00
Henry Jameson 50dc9df8a4 adds greentext, also small fixes 2019-11-14 00:18:14 +02: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
Maksim ded022a1d2 '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa' 2019-11-08 02:42:32 +00:00