Commit Graph

4125 Commits

Author SHA1 Message Date
Shpuld Shpludson 9b349b4019 Merge branch 'rc/2.0.3' into 'develop'
update MASTER for 2.0.3

See merge request pleroma/pleroma-fe!1098
2020-05-02 13:43:22 +00:00
Shpuld Shpludson 2618c1b702 Update CHANGELOG.md 2020-05-02 16:21:46 +03:00
Shpuld Shpuldson b095d2e17e don't dismiss a rejected follow request on server 2020-05-02 16:21:46 +03:00
Shpuld Shpuldson 20b53d58b7 mark single notifs as seen properly on server 2020-05-02 16:21:46 +03:00
Shpuld Shpuldson 36dcfa8cc1 follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view 2020-05-02 16:21:46 +03:00
eugenijm ab3c0e8512 Add support for follow request notifications 2020-05-02 16:21:46 +03:00
Shpuld Shpludson 4d1a674634 Update CHANGELOG.md 2020-05-02 16:21:46 +03:00
Shpuld Shpludson 372eb723db Update CHANGELOG.md 2020-05-02 16:21:46 +03:00
xenofem fe4282f44b Prioritize custom emoji a lot and boost exact matches to the top 2020-05-02 16:21:46 +03:00
xenofem aef03d53b2 Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting 2020-05-02 16:21:46 +03:00
xenofem eae0bce320 Refactor status showing/hiding code for better handling of edge cases and easier comprehension 2020-05-02 16:21:46 +03:00
Karol Kosek c4d1c2131c Fix user names with the RTL char in notifications 2020-05-02 16:21:46 +03:00
Egor Kislitsyn 0ba34eeca5 Fix pagination 2020-05-02 16:21:46 +03:00
Shpuld Shpludson 068abb4d26 Update CHANGELOG.md 2020-05-02 13:05:45 +00:00
Shpuld Shpludson 5f90b6a384 Merge branch 'fix/follow-request-notification-bugfixes' into 'develop'
Fix remaining follow request notif problems

Closes #823

See merge request pleroma/pleroma-fe!1096
2020-05-02 11:19:05 +00: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
Shpuld Shpuldson 406fdd8ede follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view 2020-05-02 10:19:47 +03:00
Shpuld Shpludson c67e9daf06 Merge branch 'follow-request-notification' into 'develop'
Add support for follow request notifications

Closes #823 and #822

See merge request pleroma/pleroma-fe!1093
2020-05-01 20:24:25 +00:00
Shpuld Shpludson af3e69743e Update CHANGELOG.md 2020-05-01 19:28:26 +00:00
Shpuld Shpludson 790b8555dc Merge branch 'fix/remove-with_move-param' into 'develop'
Remove with_move param

See merge request pleroma/pleroma-fe!1094
2020-05-01 14:41:00 +00:00
Shpuld Shpuldson 02c8a9e314 remove with_move param 2020-05-01 17:26:07 +03:00
eugenijm 01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Shpuld Shpludson dea7e2f6ac Update CHANGELOG.md 2020-04-27 08:09:31 +00:00
Shpuld Shpludson fe16b6259e Merge branch 'feature-emoji-length-sorting' into 'develop'
Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting

Closes #135

See merge request pleroma/pleroma-fe!1061
2020-04-27 08:01:57 +00:00
Shpuld Shpludson d32159d69d Merge branch 'fix/status-showing-hiding' into 'develop'
Refactor status showing/hiding code for better handling of edge cases and easier comprehension

Closes #779

See merge request pleroma/pleroma-fe!1073
2020-04-27 07:47:02 +00:00
HJ 023dec1953 Merge branch 'notification-rtl' into 'develop'
Fix user names with the RTL char in notifications

See merge request pleroma/pleroma-fe!1090
2020-04-19 01:59:19 +00:00
Karol Kosek 2fbb94fe5c
Fix user names with the RTL char in notifications 2020-04-18 19:45:24 +02:00
Shpuld Shpludson ac9985aedb Merge branch 'fix-pagination' into 'develop'
Fix pagination

See merge request pleroma/pleroma-fe!1089
2020-04-14 16:57:42 +00:00
Egor Kislitsyn 18fa338d43
Fix pagination 2020-04-13 15:26:55 +04:00
Shpuld Shpludson 8e049297ff Merge branch 'develop' into 'master'
Update master for 2.0.2

See merge request pleroma/pleroma-fe!1088
2020-04-08 13:12:42 +00:00
Shpuld Shpludson 32ab69fe0e Merge branch 'chore/2.0.1-changelog' into 'develop'
CHANGELOG.md: Add entries for upcoming 2.0.2 release

See merge request pleroma/pleroma-fe!1087
2020-04-08 13:03:15 +00:00
rinpatch b4e8b4554a CHANGELOG.md: Add entries for upcoming 2.0.2 release 2020-04-08 00:04:53 +03:00
Shpuld Shpludson 01ba4a54bc Merge branch 'develop' into 'develop'
Update polish translation

See merge request pleroma/pleroma-fe!1077
2020-04-06 10:07:33 +00:00
Shpuld Shpludson d5457c323a Merge branch 'fix/boosts-favs-private-instance' into 'develop'
Send credentials for favourited_by and reblogged_by API endpoints

Closes #795

See merge request pleroma/pleroma-fe!1086
2020-04-01 14:00:22 +00:00
Mark Felder 40005240eb Send credentials for favourited_by and reblogged_by API endpoints
This ensures the data is fetchable on private instances
2020-03-31 14:46:38 -05:00
Shpuld Shpludson 6e14fb292c Merge branch 'caskd-develop-patch-76396' into 'develop'
Prevent overflow for long usernames/domains

See merge request pleroma/pleroma-fe!1083
2020-03-14 20:03:11 +00:00
Alex b9820b84a1 Prevent overflow for long usernames/domains 2020-03-14 19:41:38 +00:00
HJ ed0b240e29 Merge branch 'fix/captcha-input' into 'develop'
Fix captcha input and disable ALL the helpers

Closes #778

See merge request pleroma/pleroma-fe!1071
2020-03-11 16:40:31 +00:00
Shpuld Shpludson 3845529412 Merge branch 'develop' into 'master'
update master with develop changes

See merge request pleroma/pleroma-fe!1082
2020-03-07 15:03:13 +00:00
HJ 2c3db2b6a2 Merge branch 'fix/themes-2.1-opacity-again' into 'develop'
fix several issues related to opacity

Closes #787 and #789

See merge request pleroma/pleroma-fe!1081
2020-03-07 14:33:19 +00:00
Henry Jameson a485386a3b fix tests 2020-03-06 21:48:40 +02:00
Henry Jameson 550080bd82 fix last issue 2020-03-06 21:39:17 +02:00
Henry Jameson 7aa5bf0896 prioritize disabled opacity over transparent keyword 2020-03-06 21:20:42 +02:00
Henry Jameson 9f2c1b4008 fix several issues related to opacity 2020-03-06 21:17:24 +02:00
Shpuld Shpludson 83d8343777 Merge branch 'develop' into 'master'
Update master with 2.0.0

See merge request pleroma/pleroma-fe!1080
2020-03-04 15:42:37 +00:00
Shpuld Shpuldson 147364b80c mention status preview fix in changelog 2020-03-04 17:30:59 +02:00
Shpuld Shpludson f58f294ee8 Merge branch 'fix/themes-2.1-transparency-pink' into 'develop'
fix trasparency problems in some cases (purple headers)

See merge request pleroma/pleroma-fe!1079
2020-03-04 06:20:28 +00:00
Henry Jameson 0702934f4f fix trasparency problems in some cases (purple headers) 2020-03-04 00:23:14 +02:00
HJ dbcd8294e8 Merge branch 'fix/remove-spinner-on-failed-status-previews' into 'develop'
Fix: failed status previews spinning forever

See merge request pleroma/pleroma-fe!1078
2020-03-02 10:49:24 +00:00