aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'rc/2.2.3' into 'master'Shpuld Shpludson2021-01-18
|\ | | | | | | | | rc 2.2.3 to MASTER See merge request pleroma/pleroma-fe!1328
| * Merge branch 'master' into 'rc/2.2.3'Shpuld Shpludson2021-01-18
| |\ | |/ |/| | | # Conflicts: # CHANGELOG.md
* | Merge branch 'rc/2.2.2' into 'master'Shpuld Shpludson2020-12-22
|\ \ | | | | | | | | | | | | prepare master for 2.2.2 See merge request pleroma/pleroma-fe!1315
| * \ Merge branch 'master' into 'rc/2.2.2'Shpuld Shpludson2020-12-22
| |\ \ | |/ / |/| | | | | # Conflicts: # CHANGELOG.md
* | | set patch date to correctShpuld Shpuldson2020-11-11
| | |
* | | Update MASTER with develop for 2.2.1Shpuld Shpuldson2020-11-09
|\ \ \
* | | | update changelog for 2.2.0Shpuld Shpuldson2020-11-06
| | | |
* | | | Merge branch 'develop' into 'master'Shpuld Shpludson2020-11-06
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge develop into master for 2.2.0 See merge request pleroma/pleroma-fe!1278
* \ \ \ \ Merge branch 'rc/2.1.2' into 'master'Shpuld Shpludson2020-09-17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge 2.1.2 to MASTER See merge request pleroma/pleroma-fe!1236
| * \ \ \ \ Merge branch 'master' into 'rc/2.1.2'Shpuld Shpludson2020-09-17
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | # Conflicts: # CHANGELOG.md
* | | | | | 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
| | | | | | | | | |
| | | | | * | | | | update changelog for 2.1.2Shpuld Shpuldson2020-09-17
| | | | | | | | | |
| | | | | | | | * | mark unreleased as 2.2.2 in changelogShpuld Shpuldson2020-12-22
| | | | | | | | | |
| | | | | | | | | * rc 2.2.3Shpuld Shpuldson2021-01-18
| | | | | | | | | |
| | | | | | | | | * Merge branch 'feat/dont-filter-own-posts' into 'develop'Shpuld Shpludson2021-01-18
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't filter own posts See merge request pleroma/pleroma-fe!1323
| | | | | | | | | | * changelog updateShpuld Shpuldson2021-01-11
| | | | | | | | | | |
| | | | | | | | | | * don't filter own postsShpuld Shpuldson2021-01-11
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2021-01-13
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1325
| | | | | | | | | | * | Translated using Weblate (Italian)Ben Is2021-01-13
| | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (677 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | | | | | | | | * | Merge branch 'feat/allow-reporting-status-directly' into 'develop'Shpuld Shpludson2021-01-12
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add report button to status ellipsis menu See merge request pleroma/pleroma-fe!1324
| | | | | | | | | | * | fix changing reported status on same userShpuld Shpuldson2021-01-12
| | | | | | | | | | | |
| | | | | | | | | | * | Add report button to status ellipsis menuShpuld Shpuldson2021-01-12
| | | | | | | | | | |/
| | | | | | | | | * | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2021-01-12
| | | | | | | | | |\ \ | | | | | | | | | | |/ | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1305
| | | | | | | | | | * Translated using Weblate (Chinese (Simplified))Kana2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (677 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
| | | | | | | | | | * Translated using Weblate (Polish)Marcin Mikołajczak2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 99.8% (676 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
| | | | | | | | | | * Translated using Weblate (Russian)Dmitriy Nelovchenko2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 79.6% (539 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| | | | | | | | | | * Translated using Weblate (Russian)Dmitriy Nelovchenko2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 78.8% (534 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| | | | | | | | | | * Translated using Weblate (Russian)rinpatch2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 77.9% (528 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| | | | | | | | | | * Translated using Weblate (Spanish)tarteka2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (677 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| | | | | | | | | | * Translated using Weblate (Italian)Ben Is2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (677 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | | | | | | | | | * Translated using Weblate (Chinese (Traditional))Kana2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 98.9% (668 of 675 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
| | | | | | | | | | * Translated using Weblate (Chinese (Simplified))Kana2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (675 of 675 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
| | | | | | | | | | * Translated using Weblate (Italian)Ben Is2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (675 of 675 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | | | | | | | | | * Translated using Weblate (Ukrainian)ZEN2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (675 of 675 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| | | | | | | | | | * Translated using Weblate (Italian)Ben Is2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (672 of 672 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | | | | | | | | | * Translated using Weblate (Ukrainian)Митець2021-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 99.8% (671 of 672 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-28 23:38:22 +0000