Commit graph

3389 commits

Author SHA1 Message Date
Shpuld Shpuldson 726d5279c1 Revert "remove with_move param"
This reverts commit 02c8a9e314.
2020-05-12 20:04:00 +03:00
Shpuld Shpludson 1186205583 Merge branch 'develop' into 'feat/relationship-refactor'
# Conflicts:
#   src/components/notification/notification.js
2020-05-08 08:35:30 +00:00
Shpuld Shpludson 921eedfd84 Merge branch 'feat/status-content-separation' into 'develop'
Refactor: Separate status content from status

See merge request pleroma/pleroma-fe!1092
2020-05-08 08:33:55 +00:00
Shpuld Shpludson f4676e17d3 Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
#   static/fontello.json
2020-05-08 08:20:03 +00:00
Shpuld Shpuldson ddc3b86d24 fix popover not closing on pressing the buttons 2020-05-08 10:46:00 +03:00
Mark Felder 41fc26869f Correctly resolve the URI of the server 2020-05-07 16:33:21 -05:00
Shpuld Shpuldson 93baa8b664 fix gap when not logged in 2020-05-08 00:10:49 +03:00
Shpuld Shpludson f40de85b92 Merge branch 'fix/signup-without-email' into 'develop'
Permit signup without email

See merge request pleroma/pleroma-fe!1072
2020-05-07 21:04:59 +00:00
Mark Felder b3003d4e8d Add notification privacy option to user settings 2020-05-06 11:46:40 -05:00
Shpuld Shpuldson f7f8a579fa make email validation conditional work 2020-05-04 12:56:39 +03:00
Shpuld Shpuldson 101eebb40b Merge branch 'develop' into fix/signup-without-email 2020-05-04 11:05:05 +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
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 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 Shpuldson 7a25160ddc Separate status content from status like in direct conversations mr 2020-04-27 12:53:04 +03: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
Shpuld Shpuldson 8b1aa593a4 fix status mutes 2020-04-27 10:06:17 +03:00
Shpuld Shpuldson af9492977a add back mute prediction, add getter for relationships 2020-04-24 18:53:17 +03:00
Shpuld Shpuldson f6fce92cf7 last lint warning 2020-04-23 14:48:15 +03:00
Shpuld Shpuldson c476193fd9 minor lint fixes 2020-04-23 14:44:55 +03:00
Shpuld Shpuldson ca00e93b60 minor fixes 2020-04-23 14:27:27 +03:00
Shpuld Shpuldson 99d8e16e4d remove with_relationships as it doesn't help 2020-04-23 14:11:48 +03:00
Shpuld Shpuldson ce0a1e7ad1 add back missing catch 2020-04-23 14:08:33 +03:00
Shpuld Shpuldson cda298c822 remove unused mutation and test for it 2020-04-23 11:17:52 +03:00
Shpuld Shpuldson aa56147322 fix follow 2020-04-22 15:06:10 +03:00
Shpuld Shpuldson 4b7007bc7d fix mistakes 2020-04-21 23:56:48 +03:00
Shpuld Shpuldson 6bb75a3a6d make relationships separate from users 2020-04-21 23:27:51 +03:00
Karol Kosek 2fbb94fe5c
Fix user names with the RTL char in notifications 2020-04-18 19:45:24 +02:00
Egor Kislitsyn 18fa338d43
Fix pagination 2020-04-13 15:26:55 +04: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
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
Mark Felder 8c5946b728 Add button in 3dot menu to copy status link to clipboard 2020-03-30 12:39:28 -05: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
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
Henry Jameson 0702934f4f fix trasparency problems in some cases (purple headers) 2020-03-04 00:23:14 +02: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
Jędrzej Tomaszewski e4ded88796 Update polish translation 2020-03-01 17:32:22 +01:00
Shpuld Shpludson 575b542db2 Merge branch 'feat/update-pleroma-themes' into 'develop'
update pleroma-dark and pleroma-light

See merge request pleroma/pleroma-fe!1070
2020-02-28 17:53:41 +00:00
Shpuld Shpludson ee582855d2 Apply suggestion to src/modules/instance.js 2020-02-28 17:20:40 +00:00
Shpuld Shpludson 31225f5d14 Fix/popover performance 2020-02-28 16:39:47 +00:00
xenofem 7fa5eb07dd Refactor status showing/hiding code for better handling of edge cases and easier comprehension 2020-02-24 18:10:15 -05:00
Mark Felder 39e3917118 Remove unneccessary nested 2020-02-24 11:23:16 -06:00