aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | |
| | | * Merge branch 'fix/long-poll-words' into 'develop'lain2020-08-25
| | | |\ | | | | | | | | | | | | | | | | | | | | fix long poll labels overflowing See merge request pleroma/pleroma-fe!1216
| | | | * fix long poll labels overflowingShpuld Shpuldson2020-08-25
| | | |/
| | | * Merge branch 'fix/user-card-avatar-too-small' into 'develop'lain2020-08-25
| | | |\ | | | | | | | | | | | | | | | | | | | | Fix some Avatar related css bugs See merge request pleroma/pleroma-fe!1215
| | | | * change more animated gif avatars to work properlyShpuld Shpuldson2020-08-25
| | | | |
| | | | * fix avatar overwrite classes in usercardShpuld Shpuldson2020-08-25
| | | |/
| | | * Merge branch 'fix/fix-tests' into 'develop'lain2020-08-19
| | | |\ | | | | | | | | | | | | | | | | | | | | Fix tests See merge request pleroma/pleroma-fe!1214
| | | | * fix tests by removing only and adding empty func for notification testsShpuld Shpuldson2020-08-19
| | | | |
| | | * | Merge branch 'support-thumbnails' into 'develop'Shpuld Shpludson2020-08-19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | EntityNormalizer: Normalize thumbnail url. See merge request pleroma/pleroma-fe!1213
| | | | * | EntityNormalizer: Normalize thumbnail url.lain2020-08-19
| | | |/ /
| | | * | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain2020-08-19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1208
| | | | * | Translated using Weblate (Italian)Ben Is2020-08-19
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (663 of 663 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | | * | Merge branch 'fix/tag-timeline-title' into 'develop'lain2020-08-19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #928 show tag name in title for tag timelines Closes #928 See merge request pleroma/pleroma-fe!1212
| | | | * | show tag name in title for tag timelinesShpuld Shpuldson2020-08-19
| | | | |/
| | | * | Merge branch 'css-fixes' into 'develop'HJ2020-08-19
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | Css fixes See merge request pleroma/pleroma-fe!1211
| | | | * fixedHenry Jameson2020-08-19
| | | | |
| | | | * lintHenry Jameson2020-08-19
| | | | |
| | | | * fix lain's bugHenry Jameson2020-08-19
| | | | |
| | | | * fix reply popovers being too slimHenry Jameson2020-08-19
| | | | |
| | | | * fixed some issues related to user avatarHenry Jameson2020-08-18
| | | | |
| | | | * revert change to form resize logicHenry Jameson2020-08-18
| | | | |
| | | | * Fix last line having slightly cut-off low-hanging parts of charactersHenry Jameson2020-08-18
| | | | |
| | | | * work around incorrect styles ordering in status popoverHenry Jameson2020-08-18
| | | | |
| | | | * fix issues with reply-linkHenry Jameson2020-08-18
| | | | |
| | | | * Fix muted notificationsHenry Jameson2020-08-18
| | | |/
| | | * Merge branch 'fix/treat-field-name-as-text' into 'develop'lain2020-08-13
| | | |\ | | | | | | | | | | | | | | | | | | | | treat field name as text See merge request pleroma/pleroma-fe!1210
| | | | * treat field name as textShpuld Shpuldson2020-08-13
| | | |/
| | | * Merge branch 'stylelint-rscss-1' into 'develop'HJ2020-08-06
| | | |\ | | | | | | | | | | | | | | | | | | | | Stylelint + RSCSS initial approach See merge request pleroma/pleroma-fe!1205
| | | | * more broken reply improvementsHenry Jameson2020-08-04
| | | | |
| | | | * lintHenry Jameson2020-08-04
| | | | |
| | | | * bring back red stripeHenry Jameson2020-08-04
| | | | |
| | | | * remove unnecessary border-radiusHenry Jameson2020-08-04
| | | | |
| | | | * i am an idiot sandwichHenry Jameson2020-08-04
| | | | |
| | | | * lintHenry Jameson2020-08-04
| | | | |
| | | | * add stylelint to CI/npm, only one file for now.Henry Jameson2020-08-04
| | | | |
| | | | * more fixesHenry Jameson2020-08-04
| | | | |
| | | | * Merge remote-tracking branch 'origin/develop' into stylelint-rscss-1Henry Jameson2020-08-04
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * origin/develop: Let's serve the README image from GitLab
| | | | * | bump node to 10 for stylintHenry Jameson2020-07-28
| | | | | |
| | | | * | neater way to do hover thing with still imageHenry Jameson2020-07-28
| | | | | |