aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | | | | | | |
* | | | | | | | | Merge branch 'plain-bg' into 'develop'HJ2020-12-18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solid color wallpaper support See merge request pleroma/pleroma-fe!1314
| * | | | | | | | | simplified code, reviewHenry Jameson2020-12-18
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into plain-bgHenry Jameson2020-12-16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/develop: fix remote follow button style Disable horizontal textarea resize Add uk.json in messages.js Display upload limit on the Features panel use title html for poll options before vote fix recent mistakes in react button
| * | | | | | | | | | change your logHenry Jameson2020-12-16
| | | | | | | | | | |
| * | | | | | | | | | theme uiHenry Jameson2020-12-16
| | | | | | | | | | |
| * | | | | | | | | | Basic no-wallpaper supportHenry Jameson2020-12-16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/timeline-bar-clickables-offset' into 'develop'Shpuld Shpludson2020-12-16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #923 block clicks in blank area of timeline menu, fix 'up-to-date' align Closes #923 See merge request pleroma/pleroma-fe!1300
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'Shpuld Shpludson2020-12-16
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
* | | | | | | | | | | | Merge branch 'feat/move-external-source-button-to-extra-buttons' into 'develop'Shpuld Shpludson2020-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move external source link to extra buttons, expand the expand button See merge request pleroma/pleroma-fe!1303
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'Shpuld Shpludson2020-12-15
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| * | | | | | | | | | | | | update changelogShpuld Shpuldson2020-12-03
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | move external source button to extra buttons, make expand button easier to ↵Shpuld Shpuldson2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | click and highlight on hover
* | | | | | | | | | | | | | Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop'Shpuld Shpludson2020-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1020 fix error handling in profile tab Closes #1020 See merge request pleroma/pleroma-fe!1299
| * | | | | | | | | | | | | Merge branch 'develop' into 'fix/fix-error-handling-in-profile-tab'Shpuld Shpludson2020-12-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| * | | | | | | | | | | | | | remove vertical align, update changelogShpuld Shpuldson2020-12-02
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix the close button on global noticesShpuld Shpuldson2020-12-02
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' into fix/fix-error-handling-in-profile-tabShpuld Shpuldson2020-12-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | refactor error handling in profile tabShpuld Shpuldson2020-12-02
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix/remote-follow-button-style' into 'develop'Shpuld Shpludson2020-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix remote follow button style See merge request pleroma/pleroma-fe!1313
| * | | | | | | | | | | | | | fix remote follow button styleShpuld Shpuldson2020-12-16
|/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'Shpuld Shpludson2020-12-15
| | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
* | | | | | | | | | | | | | Merge branch 'fix/no-emoji-in-poll-when-voting' into 'develop'Shpuld Shpludson2020-12-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1026 use title html for poll options before vote Closes #1026 See merge request pleroma/pleroma-fe!1307
| * | | | | | | | | | | | | | use title html for poll options before voteShpuld Shpuldson2020-12-07
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'prevent-textarea-resize-in-bio' into 'develop'HJ2020-12-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable horizontal textarea resize Closes #741 See merge request pleroma/pleroma-fe!1312
| * | | | | | | | | | | | | | Disable horizontal textarea resizeeugenijm2020-12-15
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'patch-1' into 'develop'HJ2020-12-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add uk.json in messages.js See merge request pleroma/pleroma-fe!1311
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-07 14:54:14 +0000