Update MASTER for 2.0.5 patch (!1105) · Merge requests · Pleroma / pleroma-fe

Merged Shpuld Shpludson requested to merge rc/2.0.5 into master 4 years ago

May 12, 2020
- update changelog for 2.0.5 · 0bc0a8d5
  Shpuld Shpludson authored 4 years ago
  
  0bc0a8d5
- Revert "remove with_move param" · 726d5279
  Shpuld Shpludson authored 4 years ago
  
  This reverts commit 02c8a9e3.
  726d5279
May 08, 2020
- update changelog · 7a0e554d
  Shpuld Shpludson authored 4 years ago
  
  7a0e554d
- Merge branch 'feat/relationship-refactor' into 'develop' · 47c56ffa
  Shpuld Shpludson authored 4 years ago
  
  Refactor: make relationships separate from users Closes #819 See merge request !1091
  47c56ffa
- Merge branch 'develop' into 'feat/relationship-refactor' · 11862055
  Shpuld Shpludson authored 4 years ago
  
  # Conflicts: # src/components/notification/notification.js
  11862055
- Merge branch 'feat/status-content-separation' into 'develop' · 921eedfd
  Shpuld Shpludson authored 4 years ago
  
  Refactor: Separate status content from status See merge request !1092
  921eedfd
- Merge branch 'feature/copy-link' into 'develop' · ec7bee6b
  Shpuld Shpludson authored 4 years ago
  
  Copy status link to clipboard See merge request !1085
  ec7bee6b
- Merge branch 'develop' into 'feature/copy-link' · f4676e17
  Shpuld Shpludson authored 4 years ago
  
  # Conflicts: # static/fontello.json
  f4676e17
- fix popover not closing on pressing the buttons · ddc3b86d
  Shpuld Shpludson authored 4 years ago
  
  ddc3b86d
May 07, 2020
- Correctly resolve the URI of the server · 41fc2686
  feld authored 4 years ago
  
  41fc2686
- fix gap when not logged in · 93baa8b6
  Shpuld Shpludson authored 4 years ago
  
  93baa8b6
- Merge branch 'fix/signup-without-email' into 'develop' · f40de85b
  Shpuld Shpludson authored 4 years ago
  
  Permit signup without email See merge request !1072
  f40de85b
- Merge branch 'feat/notification-privacy' into 'develop' · 28938340
  Shpuld Shpludson authored 4 years ago
  
  Add notification privacy option to user settings See merge request !1100
  28938340
May 06, 2020
- Add notification privacy option to user settings · b3003d4e
  feld authored 4 years ago
  
  b3003d4e
May 04, 2020
- make email validation conditional work · f7f8a579
  Shpuld Shpludson authored 4 years ago
  
  f7f8a579
- Merge branch 'develop' into fix/signup-without-email · 101eebb4
  Shpuld Shpludson authored 4 years ago
  
  101eebb4
May 02, 2020
- Merge branch 'rc/2.0.3' into 'develop' · 9b349b40
  Shpuld Shpludson authored 4 years ago
  
  update MASTER for 2.0.3 See merge request !1098
  9b349b40
- Update CHANGELOG.md · 068abb4d
  Shpuld Shpludson authored 4 years ago
  
  068abb4d
- Merge branch 'fix/follow-request-notification-bugfixes' into 'develop' · 5f90b6a3
  Shpuld Shpludson authored 4 years ago
  
  Fix remaining follow request notif problems Closes #823 See merge request !1096
  5f90b6a3
- don't dismiss a rejected follow request on server · 92ccaa97
  Shpuld Shpludson authored 4 years ago
  
  92ccaa97
- mark single notifs as seen properly on server · 75519223
  Shpuld Shpludson authored 4 years ago
  
  75519223
- follow request bugfixes, wrong text, notifs not being marked as read,... · 406fdd8e
  Shpuld Shpludson authored 4 years ago
  
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  406fdd8e
May 01, 2020
- Merge branch 'follow-request-notification' into 'develop' · c67e9daf
  Shpuld Shpludson authored 4 years ago
  
  Add support for follow request notifications Closes #823 and #822 See merge request !1093
  c67e9daf
- Update CHANGELOG.md · af3e6974
  Shpuld Shpludson authored 4 years ago
  
  af3e6974
- Merge branch 'fix/remove-with_move-param' into 'develop' · 790b8555
  Shpuld Shpludson authored 4 years ago
  
  Remove with_move param See merge request !1094
  790b8555
- remove with_move param · 02c8a9e3
  Shpuld Shpludson authored 4 years ago
  
  02c8a9e3
Apr 30, 2020
- Add support for follow request notifications · 01b07f01
  Eugenij authored 4 years ago
  
  01b07f01
Apr 27, 2020
- Separate status content from status like in direct conversations mr · 7a25160d
  Shpuld Shpludson authored 4 years ago
  
  7a25160d
- Update CHANGELOG.md · dea7e2f6
  Shpuld Shpludson authored 4 years ago
  
  dea7e2f6
- Merge branch 'feature-emoji-length-sorting' into 'develop' · fe16b625
  Shpuld Shpludson authored 4 years ago
  
  Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting Closes #135 See merge request !1061
  fe16b625
- Merge branch 'fix/status-showing-hiding' into 'develop' · d32159d6
  Shpuld Shpludson authored 4 years ago
  
  Refactor status showing/hiding code for better handling of edge cases and easier comprehension Closes #779 See merge request !1073
  d32159d6
- fix status mutes · 8b1aa593
  Shpuld Shpludson authored 4 years ago
  
  8b1aa593
Apr 24, 2020
- add back mute prediction, add getter for relationships · af949297
  Shpuld Shpludson authored 4 years ago
  
  af949297
Apr 23, 2020
- last lint warning · f6fce92c
  Shpuld Shpludson authored 4 years ago
  
  f6fce92c
- minor lint fixes · c476193f
  Shpuld Shpludson authored 4 years ago
  
  c476193f
- minor fixes · ca00e93b
  Shpuld Shpludson authored 4 years ago
  
  ca00e93b
- remove with_relationships as it doesn't help · 99d8e16e
  Shpuld Shpludson authored 4 years ago
  
  99d8e16e
- add back missing catch · ce0a1e7a
  Shpuld Shpludson authored 4 years ago
  
  ce0a1e7a
- remove unused mutation and test for it · cda298c8
  Shpuld Shpludson authored 4 years ago
  
  cda298c8
Apr 22, 2020
- fix follow · aa561473
  Shpuld Shpludson authored 4 years ago
  
  aa561473
Apr 21, 2020
- make tests not fail · 576ad975
  Shpuld Shpludson authored 4 years ago
  
  576ad975
- fix mistakes · 4b7007bc
  Shpuld Shpludson authored 4 years ago
  
  4b7007bc
- make relationships separate from users · 6bb75a3a
  Shpuld Shpludson authored 4 years ago
  
  6bb75a3a
Apr 19, 2020
- Merge branch 'notification-rtl' into 'develop' · 023dec19
  HJ authored 4 years ago
  
  Fix user names with the RTL char in notifications See merge request !1090
  023dec19
Apr 18, 2020
- Fix user names with the RTL char in notifications · 2fbb94fe
  Karol Kosek authored 4 years ago
  
  Verified
  
  2fbb94fe
Apr 14, 2020
- Merge branch 'fix-pagination' into 'develop' · ac9985ae
  Shpuld Shpludson authored 4 years ago
  
  Fix pagination See merge request !1089
  ac9985ae
Apr 13, 2020
- Fix pagination · 18fa338d
  minibikini authored 4 years ago
  
  Verified
  
  18fa338d
Mar 30, 2020
- Add button in 3dot menu to copy status link to clipboard · 8c5946b7
  feld authored 5 years ago
  
  8c5946b7
Feb 24, 2020
- Refactor status showing/hiding code for better handling of edge cases and easier comprehension · 7fa5eb07
  xenofem authored 5 years ago
  
  7fa5eb07
- Remove unneccessary nested · 39e39171
  feld authored 5 years ago
  
  39e39171
- First attempt at not requiring email address for registration · 86561592
  feld authored 5 years ago
  
  86561592
Feb 10, 2020
- Prioritize custom emoji a lot and boost exact matches to the top · 02864bc0
  xenofem authored 5 years ago
  
  02864bc0
Feb 09, 2020
- Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting · 44dea9f3
  xenofem authored 5 years ago
  
  44dea9f3

Update MASTER for 2.0.5 patch

Merge request reports

Activity