aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'cherry-pick-624af7ed' into 'master'HJ2023-06-06
|\ | | | | | | | | cherrypick parser fix into stable See merge request pleroma/pleroma-fe!1836
| * Merge branch 'harden-parser' into 'develop'HJ2023-06-06
|/ | | | | | | | | | | | fix regex misinterpreting tag name in badly formed HTML See merge request pleroma/pleroma-fe!1835 (cherry picked from commit 624af7ed00b0edb2792f84cc83f6eeb7568798c4) 00b47e16 fix regex misinterpreting tag name in badly formed HTML, prevent rich 5e656cc0 Merge remote-tracking branch 'origin/develop' into harden-parser 10e28f6c changelog 0109724a case insensititvy
* Merge branch 'develop' into 'master'HJ2022-12-23
|\ | | | | | | | | Update stable - 2.5.0 release See merge request pleroma/pleroma-fe!1711
| * 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
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | 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
| | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | fix changelog entries in wrong placesShpuld Shpuldson2021-03-01
| | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | changelog dateShpuld Shpuldson2021-03-01
| | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | Merge branch 'fix/punycode-buggy' into rc/2.3.0Shpuld Shpuldson2021-03-01
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | | set changelog versionShpuld Shpuldson2021-02-26
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * Merge branch 'hj-develop-patch-80463' into 'develop'HJ2022-12-23
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CHANGELOG.md See merge request pleroma/pleroma-fe!1710
| | | | | | | | | | | | | | | | * Update CHANGELOG.mdHJ2022-12-23
| | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | * Merge branch 'preparing-for-2.5.0' into 'develop'HJ2022-12-23
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparing for 2.5.0 release See merge request pleroma/pleroma-fe!1709
| | | | | | | | | | | | | | | | * less John Paul "Scatman" Larkin content in the screenshotHJ2022-12-22
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * Update README.md, image.pngHJ2022-12-22
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * Update to package json fileHenry Jameson2022-12-22
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * Clean up changelog, reordered so that more important to user stuff isHenry Jameson2022-12-22
| | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher up in list and less important is at the bottom, changed unreleased to 2.5.0
| | | | | | | | | | | | | | | * Merge branch 'fix-excessive-reregistrations' into 'develop'HJ2022-12-22
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rogue nested watcher triggering notifications registering too often Closes #1159 See merge request pleroma/pleroma-fe!1708
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-28 15:18:43 +0000