| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'rc/2.0.5' into 'master' | Shpuld Shpludson | 2020-05-12 |
| |\ | | | | | | | | | Update MASTER for 2.0.5 patch See merge request pleroma/pleroma-fe!1105 | ||
| | * | update changelog for 2.0.5 | Shpuld Shpuldson | 2020-05-12 |
| | | | |||
| | * | Revert "remove with_move param" | Shpuld Shpuldson | 2020-05-12 |
| | | | | | | | | | This reverts commit 02c8a9e3143f2b12f44d24f307e2718dec22987b. | ||
| | * | update changelog | Shpuld Shpuldson | 2020-05-08 |
| | | | |||
| | * | Merge branch 'feat/relationship-refactor' into 'develop' | Shpuld Shpludson | 2020-05-08 |
| | |\ | | | | | | | | | | | | | | | | | | | Refactor: make relationships separate from users Closes #819 See merge request pleroma/pleroma-fe!1091 | ||
| | | * | Merge branch 'develop' into 'feat/relationship-refactor' | Shpuld Shpludson | 2020-05-08 |
| | | |\ | | |/ | |/| | | | | # Conflicts: # src/components/notification/notification.js | ||
| | * | | Merge branch 'feat/status-content-separation' into 'develop' | Shpuld Shpludson | 2020-05-08 |
| | |\ \ | | | | | | | | | | | | | | | | | Refactor: Separate status content from status See merge request pleroma/pleroma-fe!1092 | ||
| | | * | | Separate status content from status like in direct conversations mr | Shpuld Shpuldson | 2020-04-27 |
| | | | | | |||
| | * | | | Merge branch 'feature/copy-link' into 'develop' | Shpuld Shpludson | 2020-05-08 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Copy status link to clipboard See merge request pleroma/pleroma-fe!1085 | ||
| | | * \ \ | Merge branch 'develop' into 'feature/copy-link' | Shpuld Shpludson | 2020-05-08 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | # Conflicts: # static/fontello.json | ||
| | * | | | | Merge branch 'fix/signup-without-email' into 'develop' | Shpuld Shpludson | 2020-05-07 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Permit signup without email See merge request pleroma/pleroma-fe!1072 | ||
| | | * | | | | make email validation conditional work | Shpuld Shpuldson | 2020-05-04 |
| | | | | | | | |||
| | | * | | | | Merge branch 'develop' into fix/signup-without-email | Shpuld Shpuldson | 2020-05-04 |
| | | |\ \ \ \ | |||
| | | * | | | | | Remove unneccessary nested | Mark Felder | 2020-02-24 |
| | | | | | | | | |||
| | | * | | | | | First attempt at not requiring email address for registration | Mark Felder | 2020-02-24 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'feat/notification-privacy' into 'develop' | Shpuld Shpludson | 2020-05-07 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Add notification privacy option to user settings See merge request pleroma/pleroma-fe!1100 | ||
| | | * | | | | | Add notification privacy option to user settings | Mark Felder | 2020-05-06 |
| | |/ / / / / | |||
| | * | | | | | Merge branch 'rc/2.0.3' into 'develop' | Shpuld Shpludson | 2020-05-02 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update MASTER for 2.0.3 See merge request pleroma/pleroma-fe!1098 | ||
| | * | | | | | | Update CHANGELOG.md | Shpuld Shpludson | 2020-05-02 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'fix/follow-request-notification-bugfixes' into 'develop' | Shpuld Shpludson | 2020-05-02 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remaining follow request notif problems Closes #823 See merge request pleroma/pleroma-fe!1096 | ||
| | | * | | | | | | don't dismiss a rejected follow request on server | Shpuld Shpuldson | 2020-05-02 |
| | | | | | | | | | |||
| | | * | | | | | | mark single notifs as seen properly on server | Shpuld Shpuldson | 2020-05-02 |
| | | | | | | | | | |||
| | | * | | | | | | follow request bugfixes, wrong text, notifs not being marked as read, ↵ | Shpuld Shpuldson | 2020-05-02 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | approving from follow request view | ||
| | * | | | | | | Merge branch 'follow-request-notification' into 'develop' | Shpuld Shpludson | 2020-05-01 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for follow request notifications Closes #823 and #822 See merge request pleroma/pleroma-fe!1093 | ||
| | | * | | | | | | Add support for follow request notifications | eugenijm | 2020-04-30 |
| | | | |_|_|/ / | | |/| | | | | |||
| | * | | | | | | Update CHANGELOG.md | Shpuld Shpludson | 2020-05-01 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'fix/remove-with_move-param' into 'develop' | Shpuld Shpludson | 2020-05-01 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Remove with_move param See merge request pleroma/pleroma-fe!1094 | ||
| | | * | | | | | remove with_move param | Shpuld Shpuldson | 2020-05-01 |
| | |/ / / / / | |||
| | * | | | | | Update CHANGELOG.md | Shpuld Shpludson | 2020-04-27 |
| | | | | | | | |||
| | * | | | | | Merge branch 'feature-emoji-length-sorting' into 'develop' | Shpuld Shpludson | 2020-04-27 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting Closes #135 See merge request pleroma/pleroma-fe!1061 | ||
| | | * | | | | | Prioritize custom emoji a lot and boost exact matches to the top | xenofem | 2020-02-10 |
| | | | | | | | | |||
| | | * | | | | | Allow emoji suggestions based on a match anywhere in the emoji name, but ↵ | xenofem | 2020-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve sorting | ||
| | * | | | | | | Merge branch 'fix/status-showing-hiding' into 'develop' | Shpuld Shpludson | 2020-04-27 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor status showing/hiding code for better handling of edge cases and easier comprehension Closes #779 See merge request pleroma/pleroma-fe!1073 | ||
| | | * | | | | | | Refactor status showing/hiding code for better handling of edge cases and ↵ | xenofem | 2020-02-24 |
| | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | easier comprehension | ||
| | * | | | | | | Merge branch 'notification-rtl' into 'develop' | HJ | 2020-04-19 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user names with the RTL char in notifications See merge request pleroma/pleroma-fe!1090 | ||
| | | * | | | | | | Fix user names with the RTL char in notifications | Karol Kosek | 2020-04-18 |
| | |/ / / / / / | |||
| | * | | | | | | Merge branch 'fix-pagination' into 'develop' | Shpuld Shpludson | 2020-04-14 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pagination See merge request pleroma/pleroma-fe!1089 | ||
| | | * | | | | | | Fix pagination | Egor Kislitsyn | 2020-04-13 |
| | |/ / / / / / | |||
| | | | | | * | | fix popover not closing on pressing the buttons | Shpuld Shpuldson | 2020-05-08 |
| | | | | | | | | |||
| | | | | | * | | Correctly resolve the URI of the server | Mark Felder | 2020-05-07 |
| | | | | | | | | |||
| | | | | | * | | fix gap when not logged in | Shpuld Shpuldson | 2020-05-08 |
| | | | | | | | | |||
| | | | | | * | | Add button in 3dot menu to copy status link to clipboard | Mark Felder | 2020-03-30 |
| | | | | | | | | |||
| | | | | | | * | fix status mutes | Shpuld Shpuldson | 2020-04-27 |
| | | | | | | | | |||
| | | | | | | * | add back mute prediction, add getter for relationships | Shpuld Shpuldson | 2020-04-24 |
| | | | | | | | | |||
| | | | | | | * | last lint warning | Shpuld Shpuldson | 2020-04-23 |
| | | | | | | | | |||
| | | | | | | * | minor lint fixes | Shpuld Shpuldson | 2020-04-23 |
| | | | | | | | | |||
| | | | | | | * | minor fixes | Shpuld Shpuldson | 2020-04-23 |
| | | | | | | | | |||
| | | | | | | * | remove with_relationships as it doesn't help | Shpuld Shpuldson | 2020-04-23 |
| | | | | | | | | |||
| | | | | | | * | add back missing catch | Shpuld Shpuldson | 2020-04-23 |
| | | | | | | | | |||
| | | | | | | * | remove unused mutation and test for it | Shpuld Shpuldson | 2020-04-23 |
| | | | | | | | | |||
