 Sam Therapy
|
f40c9d69e8
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
continuous-integration/drone/push Build was killed
|
2022-11-29 16:52:23 +01:00 |
|
HJ
|
d1885d45e7
|
Merge branch 'search-pagination' into 'develop'
Implement loading more statuses when searching
See merge request pleroma/pleroma-fe!1410
|
2022-11-21 19:48:24 +00:00 |
|
|
Sam Therapy
|
e71bf66223
|
Merge a ton of changes
Do any of them work? probably not.
Signed-off-by: Sam Therapy <sam@samtherapy.net>
|
2022-09-30 17:38:02 +02:00 |
|
Sean King
|
ee58e3868c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status
|
2022-08-22 19:08:58 -06:00 |
|
|
HJ
|
750696643f
|
Merge branch 'feat/report-notification' into 'develop'
#949 Feat/report notification
See merge request pleroma/pleroma-fe!1322
|
2022-08-09 21:56:15 +00:00 |
|
|
Sean King
|
dc9951d400
|
Fix merge conflicts
|
2022-08-06 22:02:21 -06:00 |
|
Alexander Tumin
|
171f6f0894
|
Lists implementation
|
2022-08-06 17:56:54 +03:00 |
|
|
Sean King
|
081aa0fd05
|
Fix merge conflicts
|
2022-08-01 18:17:09 -06:00 |
|
Henry Jameson
|
fc18673030
|
deal with no-prototype-builtins
|
2022-07-31 12:36:02 +03:00 |
|
|
Henry Jameson
|
fddb531ed2
|
--fix
|
2022-07-31 12:35:48 +03:00 |
|
Ilja
|
18d69f93d3
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification
|
2022-07-18 12:42:40 +02:00 |
|
Tusooa Zhu
|
b11ac22192
|
Fix search() not honouring type param
|
2022-07-15 20:22:39 -04:00 |
|
|
Sean King
|
fa5d35523d
|
Add ability to view status history for edited statuses
|
2022-06-20 22:52:08 -06:00 |
|
|
Sean King
|
1a333aabba
|
Add edit status functionality
|
2022-06-07 21:31:48 -06:00 |
|
Absturztaube
|
5ce9136d89
|
resolve merge conflicts
|
2022-04-03 19:03:36 +02:00 |
|
|
Ilja
|
d0c4ad22cd
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification
|
2022-02-26 02:08:13 +01:00 |
|
|
Henry Jameson
|
905b9771ec
|
stop using vue.set
|
2021-04-25 13:24:08 +03:00 |
|
|
Absturztaube
|
6ef591bdcc
|
Merge branch 'develop' into fedi-absturztau-be
|
2021-03-09 17:14:31 +01:00 |
|
Shpuld Shpuldson
|
cd2f5ced31
|
add basic validation for statusless status notifications
|
2021-02-26 14:27:25 +02:00 |
|
|
Shpuld Shpuldson
|
e73553dca7
|
wip
|
2021-01-18 15:26:08 +02:00 |
|
|
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 |
|