Commit graph

297 commits

Author SHA1 Message Date
Sean King
dc9951d400
Fix merge conflicts 2022-08-06 22:02:21 -06:00
Henry Jameson
bd5d5c9df7 "deal" with async promise executor, should be fine in these specific cases 2022-07-31 13:18:11 +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
HJ
56501e95c4 Merge branch 'from/develop/tusooa/migration-ui' into 'develop'
Add ui for account migration

See merge request pleroma/pleroma-fe!1414
2022-06-19 20:35:58 +00:00
HJ
5ad7dc7835 Merge branch 'from/develop/tusooa/backup-ui' into 'develop'
Add ui for backup

See merge request pleroma/pleroma-fe!1520
2022-06-19 20:31:19 +00:00
HJ
9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ
069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
HJ
a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
Add language options

See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
Alexander Tumin
29b084b4b8 Pass file name of cropped avatar to form data 2022-05-21 19:44:44 +03:00
Tusooa Zhu
f3ce76ddbf
Add backup UI 2022-05-09 00:42:21 -04:00
Tusooa Zhu
176da2bbe5
Add frontend ui for aliases and migration
Ref: migrate-ui
2022-04-29 21:27:03 -04:00
Tusooa Zhu
d39de30221
Add config opts for email language 2022-04-29 20:34:31 -04: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
Ilja
819b760261 Fix up and code review
* Check if it works properly
    * Notifs are shown as BE returns them
    * The Interaction view has Reports, but only when you're mod or admin
* Do some extra translations
* Fix some console spam
2022-02-26 01:53:01 +01:00
Henry Jameson
a8967d85bd streamlined WS flow, reduced spam amount related to WS reconnections 2021-03-09 02:38:10 +02:00
Shpuld Shpuldson
52c22e863e Fix setting report state, add proper error handling 2021-02-03 12:02:37 +02:00
Shpuld Shpuldson
3822a73a49 Fix report modal not working, add include_types 2021-02-01 12:55:23 +02:00
Shpuld Shpuldson
54def7d210 remove mock data 2021-01-27 13:13:59 +02:00
Shpuld Shpuldson
06f795d1d6 add proper state switcher 2021-01-27 13:13:10 +02:00
Shpuld Shpuldson
e73553dca7 wip 2021-01-18 15:26:08 +02:00
Henry Jameson
48bef143d8 fix not being able to re-enable sockets until page refresh 2021-01-13 21:33:20 +02:00
Shpuld Shpuldson
8674f20023 separated component 2021-01-11 19:32:58 +02:00
Shpuld Shpuldson
a4e3cccf1c somewhat workign version still with fixture 2021-01-06 18:31:34 +02:00
Shpuld Shpuldson
ab2c2c66bf Merge branch 'develop' into feat/report-notification 2021-01-05 13:58:52 +02:00
Shpuld Shpuldson
5e96260a4f add test data for dev 2020-12-04 12:48:15 +02:00
Shpuld Shpuldson
4dde9c4d52 refactor error handling in profile tab 2020-12-02 12:46:31 +02:00
Shpuld Shpuldson
d150dae5d1 fixes to timeline error handling 2020-11-10 12:52:54 +02:00
eugenijm
e798e9a417 Optimistic message sending for chat 2020-11-01 23:36:58 +03:00
Shpuld Shpludson
91778a0276 Merge branch 'feat/custom-virtual-scrolling' into 'develop'
Timeline virtual scrolling

See merge request pleroma/pleroma-fe!1043
2020-09-29 10:18:37 +00:00
Shpuld Shpludson
f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Maksim Pechnikov
947d7cd6f2 added import/export mutes 2020-09-08 09:41:42 +03:00
Shpuld Shpuldson
89a677f5e8 add basic idempotency support 2020-07-15 16:19:57 +03:00
eugenijm
ed7310c04b Undo the promise rejection on the json parser error in promisedRequest
to keep the existing behavior in case some parts of the code rely on it
and to limit the overall scope of the changes.
2020-07-08 15:21:31 +03:00
eugenijm
aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Shpuld Shpludson
eea002e6f5 streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff 2020-07-08 10:11:17 +00:00
Shpuld Shpuldson
e3991db5c4 fix conflicts and add error handling to media descriptions 2020-07-07 10:01:37 +03:00
Shpuld Shpuldson
b4709f93d4 add more ways to set description 2020-07-07 09:07:20 +03:00
Shpuld Shpuldson
87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Shpuld Shpuldson
afdc3f96f0 fix conflicts, make subject update the preview 2020-07-06 10:45:47 +03:00
Eugenij
de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpludson
c0fb35b106 Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'
# Conflicts:
#   CHANGELOG.md
2020-07-02 04:50:03 +00:00
Shpuld Shpuldson
ea09bbecf8 Make use of backend reply filtering 2020-06-30 17:02:38 +03:00
Shpuld Shpuldson
223fabfe90 add rich text preview 2020-06-28 12:16:41 +03:00
William Pitcock
2c6ec37e6a media description support 2020-06-28 02:10:06 -04:00
lain
0c36486299 API: Remove fetch polyfill
All browser except IE have supported this for longer than
Pleroma even exists.
2020-06-11 18:49:39 +02:00
Sergey Suprunenko
1007039478
Autocomplete domain mutes from list of known instances 2020-06-08 13:17:18 +02:00
Ivan Tashkinov
5235e7ea1e Removed with_muted param usage for user favorites timeline endpoint (it only supports pagination params). 2020-05-25 08:48:44 +03:00
Shpuld Shpuldson
9c7cb3a954 remove search1 with_relationships 2020-05-13 18:04:30 +03:00
Shpuld Shpuldson
355281081a don't send undefined 2020-05-13 17:53:43 +03:00