Commit graph

248 commits

Author SHA1 Message Date
Absturztaube a6822d26bb Merge branch 'develop' into fedi-absturztau-be 2020-11-23 09:21:56 +01:00
Shpuld Shpuldson 1d2ba946b6 make notifications also use the popup errors, remove all error from status/notif state 2020-11-10 14:28:10 +02:00
Shpuld Shpuldson d150dae5d1 fixes to timeline error handling 2020-11-10 12:52:54 +02:00
Absturztaube a43623c5a5 Merge branch 'develop' into fedi-absturztau-be 2020-10-29 09:24:25 +01:00
Absturztaube 7a9bd70a09 Merge branch 'develop' into fedi-absturztau-be 2020-10-07 18:51:14 +02:00
Shpuld Shpludson 8a34ff2957 Merge branch 'develop' into 'feat/masto-ws-deletes'
# Conflicts:
#   CHANGELOG.md
#   src/components/status/status.js
#   src/components/status/status.scss
2020-10-01 12:54:54 +00:00
Shpuld Shpludson f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Shpuld Shpuldson 40ca0b394e add basic deletes support that works with masto WS 2020-09-06 15:28:09 +03:00
Absturztaube 6a77b27a42 resolve merge conflicts 2020-07-26 11:17:14 +02:00
eugenijm 2c35afeebf Add desktop chat notifications 2020-07-13 06:27:51 +03:00
Absturztaube 2cd6d336ba remove dublicate 2020-07-08 21:53:44 +02:00
Absturztaube 7fa2dfecc6 Merge branch 'direct-conversations' of https://git.pleroma.social/eugenijm/pleroma-fe into direct-conversations 2020-07-08 19:16:44 +02:00
eugenijm aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Eugenij de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson ea09bbecf8 Make use of backend reply filtering 2020-06-30 17:02:38 +03:00
lain a52a393266 NotificationUtils: Extract preparation of notification object. 2020-06-11 15:22:31 +02:00
eugenijm f2b3d1e6b0 Use streaming for real time updates instead of notifications, disable
polling when streaming is enabled.
2020-05-30 17:59:35 +03:00
eugenijm 6c2c0883ce Use since_id when pulling the current chat messages 2020-05-30 13:47:48 +03:00
eugenijm 8a8a9ad562 WIP notification count 2020-05-29 09:43:52 +03:00
eugenijm 804cf3abc5 WIP: Chats 2020-05-29 09:43:52 +03:00
Henry Jameson 9d09e4090f multiple fixes 2020-05-26 01:01:25 +03:00
Henry Jameson 83e5ee5494 fix non-mention notifs 2020-05-26 00:22:15 +03:00
Henry Jameson b5c1d074f8 fix reprööted posts not being muted properly. fix muted posts making
desktop notifications
2020-05-25 23:38:31 +03:00
Shpuld Shpuldson 92ccaa97bb don't dismiss a rejected follow request on server 2020-05-02 11:51:39 +03:00
Shpuld Shpuldson 75519223f9 mark single notifs as seen properly on server 2020-05-02 10:52:57 +03:00
eugenijm 01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Shpuld Shpuldson ab4005add5 add status unavailable message when status can't be loaded in status preview 2020-03-02 08:35:57 +02:00
Shpuld Shpludson f6b482be51 Emoji Reactions - fixes and improvements 2020-02-11 12:24:51 +00:00
Shpuld Shpuldson a018ea622c change emoji reactions to use new format 2020-01-26 15:45:12 +02:00
Shpuld Shpuldson b10b92a876 clean up code, fix prediction bug 2020-01-14 10:06:14 +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
kPherox e8333fff8d
change the expression of move 2019-12-11 18:30:23 +09: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 e86af0c965 Change naming, make more general 2019-12-09 09:02:34 +09:00
Wyatt Benno 13fc2612ae Change 403 messaging 2019-12-05 11:48:37 +09:00
Henry Jameson ddb6fb9217 Backend Interactor service overhaul, removed the need for copypasting 2019-11-24 13:57:46 +02:00
Shpuld Shpuldson d007502629 add fetching for emoji reactions, draft design 2019-11-15 08:39:21 +02:00
taehoon f969e9ab3d add fetchStatus action 2019-10-24 22:21:33 -04:00
rinpatch b33667a743 Avoid iterating over statuses to set thread_muted if the backend does
not support the extension
2019-09-04 22:17:29 +03:00
rinpatch 1a5a7bbebf Set thread_muted for all statuses with the same conversation id on
status mute/unmute
2019-09-04 21:11:13 +03:00
taehoon daf7d4e661 fix pin/unpin status logic 2019-09-01 13:07:43 -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 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