Commit graph

3937 commits

Author SHA1 Message Date
Shpuld Shpludson
17b6d8ddb8 Merge branch 'move-type-notification' into 'develop'
Add setting for allow following move

Closes #732

See merge request pleroma/pleroma-fe!1054
2020-02-10 14:51:35 +00:00
Shpuld Shpludson
6be6241767 Merge branch 'feature-collapsed-media-indicator' into 'develop'
Indicate whether collapsed statuses contain gallery media or link preview cards

Closes #767

See merge request pleroma/pleroma-fe!1056
2020-02-10 14:50:42 +00:00
Shpuld Shpludson
788ff531d6 Merge branch 'feature/mrf-keyword-policy-disclosure' into 'develop'
MRF Keyword Policy Disclosure

See merge request pleroma/pleroma-fe!1055
2020-02-10 08:04:58 +00:00
Hakaba Hitoyo
dafced3a86 MRF Keyword Policy Disclosure 2020-02-10 08:04:58 +00:00
xenofem
e36c39be19 Include non-gallery attachments and distinguish between images and videos 2020-02-08 16:01:01 -05:00
xenofem
36e19128bf Indicate whether collapsed statuses contain gallery media or link preview cards 2020-02-08 13:15:09 -05:00
feld
8fcb9c42aa Merge branch 'fix/escape-html' into 'develop'
Escape HTML from display name and subject fields

Closes #724

See merge request pleroma/pleroma-fe!1052
2020-02-06 16:12:11 +00:00
kPherox
ce68ef0138
Add option text 2020-02-04 04:54:36 +09:00
kPherox
a06f3a7fbc
Add with_move param for fetching notification 2020-02-04 04:54:36 +09:00
kPherox
9b7497a659
Change to hide User migrates tab when allow following move 2020-02-04 04:54:36 +09:00
kPherox
9bbf10b55d
Add setting for allow_following_move 2020-02-04 04:54:28 +09:00
HJ
e73e235b4d Merge branch 'fix/one-click-nsfw-videos' into 'develop'
Fix one click nsfw unhide on videos

See merge request pleroma/pleroma-fe!1053
2020-01-31 00:24:54 +00:00
Shpuld Shpludson
4a266a4d05 Fix one click nsfw unhide on videos 2020-01-31 00:24:54 +00:00
rinpatch
746416207b Escape HTML from display name and subject fields
Closes #724
2020-01-30 19:58:23 +03:00
Shpuld Shpuldson
c54111797a add emoji reactions to changelog 2020-01-28 17:54:40 +02:00
Shpuld Shpuldson
29806c9629 fix emoji reaction classes broken in develop 2020-01-28 17:53:47 +02:00
lain
73253b87bf Merge branch 'feat/emoji-reactions' into 'develop'
Emoji reactions

See merge request pleroma/pleroma-fe!1049
2020-01-28 15:24:56 +00:00
Shpuld Shpuldson
6afff4f8c2 review changes 2020-01-28 17:09:25 +02:00
HJ
4a11ee9768 Merge branch 'fix-password-and-email-update' into 'develop'
Fix email and password forms in user settings

See merge request pleroma/pleroma-fe!1050
2020-01-28 11:13:17 +00:00
eugenijm
566f013ac4 Fix password and email update 2020-01-28 06:12:32 +03:00
Shpuld Shpuldson
4e04079739 Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe into feat/emoji-reactions 2020-01-27 18:44:25 +02:00
Shpuld Shpuldson
e6291e4ee1 remove unnecessary anonymous function 2020-01-27 18:43:26 +02:00
lain
cb205036f9 Apply suggestion to src/services/api/api.service.js 2020-01-27 14:18:15 +00:00
Shpuld Shpuldson
e4e3a28838 remove logs/commented code 2020-01-27 15:49:05 +02:00
Shpuld Shpuldson
0de627baae remove favs count from react button 2020-01-26 16:18:57 +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
HJ
b0b0fc403a Merge branch 'event-target-fix' into 'develop'
Polyfills for EventTarget and CustomEvent

Closes #756

See merge request pleroma/pleroma-fe!1048
2020-01-24 12:42:54 +00:00
eugenijm
2c61eb8e7f Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE) 2020-01-24 00:55:13 +03:00
HJ
deb2ddb398 Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'
Fix missing TWKN when logged in, but server is set to private mode.

Closes #759

See merge request pleroma/pleroma-fe!1047
2020-01-23 18:10:55 +00:00
Mark Felder
9d8dbd8340 Fix missing TWKN when logged in, but server is set to private mode. 2020-01-23 12:00:50 -06:00
Shpuld Shpludson
ad8eb88323 Merge branch 'fix-follow-requests' into 'develop'
Fix follower request fetching

Closes pleroma#1523 and #757

See merge request pleroma/pleroma-fe!1046
2020-01-21 16:31:41 +00:00
lain
8080981fcd Fix follower request fetching 2020-01-21 16:51:49 +01:00
Shpuld Shpuldson
f052ac4a1e Add domain mutes to changelog 2020-01-15 22:38:31 +02:00
Shpuld Shpludson
6bd6ec66bc Merge branch 'tae/pleroma-fe-663' into 'develop'
Implement domain mutes v2

See merge request pleroma/pleroma-fe!1045
2020-01-15 20:22:54 +00:00
Shpuld Shpludson
7a013ac393 Implement domain mutes v2 2020-01-15 20:22:54 +00:00
Shpuld Shpludson
e3de2964cc Merge branch '736' into 'develop'
Fix "Follow button is out of sync in the about page"

Closes #736

See merge request pleroma/pleroma-fe!1035
2020-01-15 18:40:45 +00:00
Shpuld Shpuldson
7397636914 change changelog to reflect actual release history of frontend 2020-01-14 16:01:30 +02:00
Shpuld Shpludson
dac263e224 Merge branch 'fix/registration-backend-interactor-fix' into 'develop'
Fix #750 , fix error messages and captcha resetting

Closes #750

See merge request pleroma/pleroma-fe!1042
2020-01-14 13:45:00 +00:00
Shpuld Shpludson
662afe973a Fix #750 , fix error messages and captcha resetting 2020-01-14 13:45:00 +00:00
Shpuld Shpludson
ac90d4c532 Merge branch 'feat/optimize-amount-of-notifs-to-render' into 'develop'
Optimize Notifications Rendering

See merge request pleroma/pleroma-fe!1041
2020-01-14 13:28:57 +00:00
Shpuld Shpludson
86380f0429 Optimize Notifications Rendering 2020-01-14 13:28:57 +00:00
Shpuld Shpuldson
dd740043c6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-01-14 13:39:17 +02:00
Shpuld Shpuldson
9b8cdb6525 update CHANGELOG 2020-01-14 13:39:01 +02:00
Shpuld Shpludson
b275494a86 Merge branch 'fix/fetch-seen-notifs-properly' into 'develop'
Fix #526: Oldest notifications left unseen when using "Read!" in another tab

Closes #526

See merge request pleroma/pleroma-fe!1040
2020-01-14 09:26:30 +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
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