| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 |
| | | | | | |||
| | | * | | 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 | ||
| | | * | | Add support for follow request notifications | eugenijm | 2020-05-02 |
| | | | | | |||
| | | * | | Update CHANGELOG.md | Shpuld Shpludson | 2020-05-02 |
| | | | | | |||
| | | * | | Update CHANGELOG.md | Shpuld Shpludson | 2020-05-02 |
| | | | | | |||
| | | * | | Prioritize custom emoji a lot and boost exact matches to the top | xenofem | 2020-05-02 |
| | | | | | |||
| | | * | | Allow emoji suggestions based on a match anywhere in the emoji name, but ↵ | xenofem | 2020-05-02 |
| | | | | | | | | | | | | | | | | | improve sorting | ||
| | | * | | Refactor status showing/hiding code for better handling of edge cases and ↵ | xenofem | 2020-05-02 |
| | | | | | | | | | | | | | | | | | easier comprehension | ||
| | | * | | Fix user names with the RTL char in notifications | Karol Kosek | 2020-05-02 |
| | | | | | |||
| | | * | | Fix pagination | Egor Kislitsyn | 2020-05-02 |
| | | | | | |||
| | | * | | Merge branch 'develop' into 'master' | Shpuld Shpludson | 2020-04-08 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Update master for 2.0.2 See merge request pleroma/pleroma-fe!1088 | ||
| | | * \ \ | Merge branch 'develop' into 'master' | Shpuld Shpludson | 2020-03-07 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | update master with develop changes See merge request pleroma/pleroma-fe!1082 | ||
| | | * \ \ \ | Merge branch 'develop' into 'master' | Shpuld Shpludson | 2020-03-04 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update master with 2.0.0 See merge request pleroma/pleroma-fe!1080 | ||
| | | * \ \ \ \ | Merge branch 'develop' into 'master' | Shpuld Shpludson | 2020-02-28 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update master with 2.0.0 See merge request pleroma/pleroma-fe!1074 | ||
| | | * \ \ \ \ \ | Merge branch 'develop' into 'master' | Shpuld Shpludson | 2020-01-15 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `master` refresh with `develop` See merge request pleroma/pleroma-fe!1028 | ||
| | * | | | | | | | | 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 |
| | |/ / / / / / / / | |||
| | * | | | | | | | | Merge branch 'chore/2.0.1-changelog' into 'develop' | Shpuld Shpludson | 2020-04-08 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG.md: Add entries for upcoming 2.0.2 release See merge request pleroma/pleroma-fe!1087 | ||
| | | * | | | | | | | | CHANGELOG.md: Add entries for upcoming 2.0.2 release | rinpatch | 2020-04-08 |
| | |/ / / / / / / / | |||
| | * | | | | | | | | Merge branch 'develop' into 'develop' | Shpuld Shpludson | 2020-04-06 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update polish translation See merge request pleroma/pleroma-fe!1077 | ||
| | | * | | | | | | | | Update polish translation | Jędrzej Tomaszewski | 2020-03-01 |
| | | | |_|_|_|/ / / | | |/| | | | | | | |||
