Commit graph

4504 commits

Author SHA1 Message Date
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 Shpuldson
7a25160ddc Separate status content from status like in direct conversations mr 2020-04-27 12:53:04 +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
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
576ad9750b make tests not fail 2020-04-22 00:07:01 +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
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
Mark Felder
8c5946b728 Add button in 3dot menu to copy status link to clipboard 2020-03-30 12:39:28 -05:00
Henry Jameson
3527c14625 fix list after conflict 2020-03-25 18:38:06 +02:00
Henry Jameson
f881d6d2b5 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Prevent overflow for long usernames/domains
  fix tests
  fix last issue
  prioritize disabled opacity over transparent keyword
  fix several issues related to opacity
  mention status preview fix in changelog
  fix trasparency problems in some cases (purple headers)
  add status unavailable message when status can't be loaded in status preview
  Fix captcha input and disable ALL the helpers
2020-03-25 18:37:32 +02: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
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
Henry Jameson
6595083003 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Apply suggestion to src/modules/instance.js
  Fix/popover performance
  make theme loading work with source-only presets
  remove bloat from themes
  update using variables
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  make panel header highlight less harsh
  update pleroma-dark and pleroma-light
  stop using customTheme in user card, instead use color slots. fix for opacity inheritance polluting inheritors
  Fix user activation/deactivation, deletion, and role assignment in the moderation menu
2020-02-29 15:35:46 +02:00
Shpuld Shpludson
1b9805b550 Merge branch 'develop' into 'master'
Update master with 2.0.0

See merge request pleroma/pleroma-fe!1074
2020-02-28 20:27:02 +00:00