aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Translated using Weblate (Esperanto)Tirifto2022-12-29
| | | | | | | Currently translated at 98.0% (904 of 922 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
* Translated using Weblate (Ukrainian)Dmytro Poltavchenko2022-12-29
| | | | | | | Currently translated at 87.8% (810 of 922 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
* Translated using Weblate (Ukrainian)Dmytro Poltavchenko2022-12-29
| | | | | | | Currently translated at 87.8% (810 of 922 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
* Merge branch 'renovate/sass-1.x' into 'develop'tusooa2022-12-29
|\ | | | | | | | | Update dependency sass to v1.57.1 See merge request pleroma/pleroma-fe!1729
| * Update dependency sass to v1.57.1Pleroma Renovate Bot2022-12-29
| |
* | Merge branch 'renovate/mocha-10.x' into 'develop'tusooa2022-12-29
|\ \ | |/ |/| | | | | Update dependency mocha to v10.2.0 See merge request pleroma/pleroma-fe!1727
| * Update dependency mocha to v10.2.0Pleroma Renovate Bot2022-12-28
|/
* Merge branch 'tusooa/notif-settings' into 'develop'HJ2022-12-27
|\ | | | | | | | | Make notification settings work See merge request pleroma/pleroma-fe!1726
| * Make notification settings worktusooa2022-12-27
| |
* | Merge branch 'renovate/eslint-plugin-vue-9.x' into 'develop'tusooa2022-12-27
|\ \ | | | | | | | | | | | | Update dependency eslint-plugin-vue to v9.8.0 See merge request pleroma/pleroma-fe!1723
| * | Update dependency eslint-plugin-vue to v9.8.0Pleroma Renovate Bot2022-12-27
|/ /
* | Merge branch 'renovate/babel-loader-8.x' into 'develop'tusooa2022-12-26
|\ \ | | | | | | | | | | | | Update dependency babel-loader to v8.3.0 See merge request pleroma/pleroma-fe!1720
| * | Update dependency babel-loader to v8.3.0Pleroma Renovate Bot2022-12-26
| |/
* | Merge branch 'renovate/eslint-8.x' into 'develop'tusooa2022-12-26
|\ \ | | | | | | | | | | | | Update dependency eslint to v8.30.0 See merge request pleroma/pleroma-fe!1721
| * | Update dependency eslint to v8.30.0Pleroma Renovate Bot2022-12-26
| |/
* | Merge branch 'renovate/vue-monorepo' into 'develop'tusooa2022-12-26
|\ \ | |/ |/| | | | | Update vue monorepo See merge request pleroma/pleroma-fe!1718
| * Update vue monorepoPleroma Renovate Bot2022-12-25
|/
* Merge branch 'renovate/webpack-hot-middleware-2.x' into 'develop'tusooa2022-12-24
|\ | | | | | | | | Update dependency webpack-hot-middleware to v2.25.3 See merge request pleroma/pleroma-fe!1714
| * Update dependency webpack-hot-middleware to v2.25.3Pleroma Renovate Bot2022-12-24
| |
* | Merge branch 'renovate/postcss-loader-7.x' into 'develop'tusooa2022-12-24
|\ \ | | | | | | | | | | | | Update dependency postcss-loader to v7.0.2 See merge request pleroma/pleroma-fe!1713
| * | Update dependency postcss-loader to v7.0.2Pleroma Renovate Bot2022-12-24
| |/
* | Merge branch 'renovate/css-loader-6.x' into 'develop'tusooa2022-12-24
|\ \ | |/ |/| | | | | Update dependency css-loader to v6.7.3 See merge request pleroma/pleroma-fe!1698
| * Update dependency css-loader to v6.7.3Pleroma Renovate Bot2022-12-24
|/
* Merge branch 'renovate/font-awesome' into 'develop'tusooa2022-12-24
|\ | | | | | | | | Update Font Awesome See merge request pleroma/pleroma-fe!1680
| * Update Font AwesomePleroma Renovate Bot2022-11-16
| |
* | Merge branch 'renovate/babel-monorepo' into 'develop'tusooa2022-12-24
|\ \ | | | | | | | | | | | | Update babel monorepo See merge request pleroma/pleroma-fe!1676
| * | Update babel monorepoPleroma Renovate Bot2022-12-23
| | |
* | | Merge branch 'renovate/karma-spec-reporter-0.x' into 'develop'tusooa2022-12-24
|\ \ \ | | | | | | | | | | | | | | | | Update dependency karma-spec-reporter to v0.0.36 See merge request pleroma/pleroma-fe!1704
| * | | Update dependency karma-spec-reporter to v0.0.36Pleroma Renovate Bot2022-12-20
| | | |
* | | | Merge branch 'renovate/autoprefixer-10.x' into 'develop'tusooa2022-12-24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency autoprefixer to v10.4.13 See merge request pleroma/pleroma-fe!1666
| * | | | Update dependency autoprefixer to v10.4.13Pleroma Renovate Bot2022-12-15
| | | | |
* | | | | Merge branch 'renovate/postcss-8.x' into 'develop'tusooa2022-12-24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency postcss to v8.4.20 See merge request pleroma/pleroma-fe!1664
| * | | | | Update dependency postcss to v8.4.20Pleroma Renovate Bot2022-12-12
| | | | | |
* | | | | | Merge branch 'fix-master-conflicts' into 'develop'HJ2022-12-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix master/develop merge conflicts See merge request pleroma/pleroma-fe!1712
| * | | | | | Merge branch 'master' into developHenry Jameson2022-12-23
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: fix changelog entries in wrong places changelog date set changelog version rc 2.2.3 mark unreleased as 2.2.2 in changelog set patch date to correct update changelog for 2.2.0 update changelog for 2.1.2 update changelog with 2.1.1 fix boomarks mistake in changelog add missing release to changelog to fix conflicts add back unreleased/patch set 2.1.0 date and remove rc from changelog change changelog update changelog for 2.0.5 Revert "remove with_move param"
| * | | | | | Merge branch 'develop' into 'master'Shpuld Shpludson2022-01-09
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MASTER for 2.4.2 See merge request pleroma/pleroma-fe!1421
| * \ \ \ \ \ \ Merge branch 'develop' into 'master'Shpuld Shpludson2021-08-08
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MASTER for 2.4.0 See merge request pleroma/pleroma-fe!1406
| * \ \ \ \ \ \ \ Update master with 2.4.0Shpuld Shpuldson2021-08-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rc/2.3.0' into 'master'Shpuld Shpludson2021-03-01
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.3.0 to MASTER See merge request pleroma/pleroma-fe!1366
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into 'rc/2.3.0'Shpuld Shpludson2021-03-01
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| * | | | | | | | | | 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