aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'rc/2.1.1' into 'master'Shpuld Shpludson2020-09-08
|\ | | | | | | | | Update master with 2.1.1 See merge request pleroma/pleroma-fe!1231
| * Merge branch 'master' into 'rc/2.1.1'Shpuld Shpludson2020-09-08
| |\ | |/ |/| | | # Conflicts: # CHANGELOG.md
* | Merge branch '2.1.0-rc0' into 'master'Shpuld Shpludson2020-08-27
|\ \ | | | | | | | | | | | | 2.1.0 into master See merge request pleroma/pleroma-fe!1217
| * \ Merge branch '2.1.0-rc0' of git.pleroma.social:pleroma/pleroma-fe into 2.1.0-rc0Shpuld Shpuldson2020-08-27
| |\ \
| | * \ Merge branch 'master' into '2.1.0-rc0'Shpuld Shpludson2020-08-27
| | |\ \ | |_|/ / |/| | | | | | | | | | | # Conflicts: # CHANGELOG.md # src/services/api/api.service.js
* | | | Merge branch 'rc/2.0.5' into 'master'Shpuld Shpludson2020-05-12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update MASTER for 2.0.5 patch See merge request pleroma/pleroma-fe!1105
| * | | | update changelog for 2.0.5Shpuld Shpuldson2020-05-12
| | | | |
| * | | | Revert "remove with_move param"Shpuld Shpuldson2020-05-12
| | | | | | | | | | | | | | | | | | | | This reverts commit 02c8a9e3143f2b12f44d24f307e2718dec22987b.
* | | | | Merge branch 'rc/2.0.3' into 'master'Shpuld Shpludson2020-05-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update MASTER with 2.0.3 for real See merge request pleroma/pleroma-fe!1099
| | | * | | fix boomarks mistake in changelogShpuld Shpuldson2020-08-27
| | | |/ /
| | | * | add missing release to changelog to fix conflictsShpuld Shpuldson2020-08-27
| | | | |
| | | * | add back unreleased/patchShpuld Shpuldson2020-08-27
| | | | |
| | | * | set 2.1.0 date and remove rc from changelogShpuld Shpuldson2020-08-27
| | | | |
| | | * | change changelogShpuld Shpuldson2020-08-26
| | | | |
| | | | * update changelog with 2.1.1Shpuld Shpuldson2020-09-08
| | | | |
| | | | * Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2020-09-07
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1226
| | | | | * Translated using Weblate (Basque)tarteka2020-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 77.4% (513 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
| | | | | * Translated using Weblate (Spanish)tarteka2020-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (662 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| | | | | * Translated using Weblate (Spanish)Anonymous2020-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 83.2% (551 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| | | | | * Translated using Weblate (Spanish)tarteka2020-09-07
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 83.2% (551 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| | | | * Merge branch 'chat-desktop-notifications-fix' into 'develop'Shpuld Shpludson2020-09-07
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show desktop notifications for your own chat messages Closes #951 See merge request pleroma/pleroma-fe!1225
| | | | | * Do not show desktop notifications for your own chat messageseugenijm2020-09-04
| | | | |/
| | | | * Merge branch 'fix/locked-account-link-fix' into 'develop'Shpuld Shpludson2020-09-04
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open profile tab from 'locked' link in FO-post warning - Fix #945 Closes #945 See merge request pleroma/pleroma-fe!1223
| | | | | * Add hacky functionality to open specific settings tabsShpuld Shpuldson2020-09-03
| | | | | |
| | | | * | Merge branch 'fix/autocomplete-fixes' into 'develop'lain2020-09-03
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite word split for autocomplete, fix #930 fix #681 Closes #681 and #930 See merge request pleroma/pleroma-fe!1218
| | | | | * | Merge branch 'develop' into 'fix/autocomplete-fixes'Shpuld Shpludson2020-08-31
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | | | | * | update changelog for autocomplete fixesShpuld Shpuldson2020-08-28
| | | | | | |
| | | | | * | Merge branch 'develop' into fix/autocomplete-fixesShpuld Shpuldson2020-08-28
| | | | | |\ \
| | | | | * | | Rewrite word split imperatively for controlShpuld Shpuldson2020-08-28
| | | | | | | |
| | | | | * | | wip startShpuld Shpuldson2020-08-27
| | | | |/ / / | | | |/| | |
| | | | * | | Merge branch 'fix/password-reset-behavior' into 'develop'Shpuld Shpludson2020-09-02
| | | | |\ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | Password reset no longer informs user of errors or account existence See merge request pleroma/pleroma-fe!1221
| | | | | * | Password reset no longer informs user of errors or account existenceMark Felder2020-09-01
| | | | |/ /
| | | | * | Merge branch 'fix/hide-polls-in-collapsed-posts' into 'develop'HJ2020-08-31
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | hide poll when subject collapsed, fix #683 Closes #683 See merge request pleroma/pleroma-fe!1220
| | | | | * add changelog entryShpuld Shpuldson2020-08-31
| | | | | |
| | | | | * hide poll when subject collapsed, but show poll iconShpuld Shpuldson2020-08-31
| | | | |/
| | | | * Merge branch 'chore/fix-changelog' into 'develop'Shpuld Shpludson2020-08-28
| | | |/| | | | | | | | | | | | | | | | | | | | | Chore/fix-changelog See merge request pleroma/pleroma-fe!1219
| | | | * update changelog with 2.1.0, fix Add -> Added in older releasesShpuld Shpuldson2020-08-28
| | | |/
| | | * Merge branch 'fix/long-poll-words' into 'develop'lain2020-08-25
| | | |\ | | | | | | | | | | | | | | | | | | | | fix long poll labels overflowing See merge request pleroma/pleroma-fe!1216
| | | | * fix long poll labels overflowingShpuld Shpuldson2020-08-25
| | | |/
| | | * Merge branch 'fix/user-card-avatar-too-small' into 'develop'lain2020-08-25
| | | |\ | | | | | | | | | | | | | | | | | | | | Fix some Avatar related css bugs See merge request pleroma/pleroma-fe!1215
| | | | * change more animated gif avatars to work properlyShpuld Shpuldson2020-08-25
| | | | |
| | | | * fix avatar overwrite classes in usercardShpuld Shpuldson2020-08-25
| | | |/
| | | * Merge branch 'fix/fix-tests' into 'develop'lain2020-08-19
| | | |\ | | | | | | | | | | | | | | | | | | | | Fix tests See merge request pleroma/pleroma-fe!1214
| | | | * fix tests by removing only and adding empty func for notification testsShpuld Shpuldson2020-08-19
| | | | |
| | | * | Merge branch 'support-thumbnails' into 'develop'Shpuld Shpludson2020-08-19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | EntityNormalizer: Normalize thumbnail url. See merge request pleroma/pleroma-fe!1213
| | | | * | EntityNormalizer: Normalize thumbnail url.lain2020-08-19
| | | |/ /
| | | * | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain2020-08-19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1208
| | | | * | Translated using Weblate (Italian)Ben Is2020-08-19
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (663 of 663 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | | * | Merge branch 'fix/tag-timeline-title' into 'develop'lain2020-08-19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #928 show tag name in title for tag timelines Closes #928 See merge request pleroma/pleroma-fe!1212
| | | | * | show tag name in title for tag timelinesShpuld Shpuldson2020-08-19
| | | | |/