aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-13 03:21:15 +0000