aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | |
| * | refactor statusHenry Jameson2020-07-28
| | |
| * | separate status scss into another fileHenry Jameson2020-07-27
| | |
* | | Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'lain2020-08-06
|\ \ \ | | | | | | | | | | | | | | | | Separate timeline navigation from navpanel See merge request pleroma/pleroma-fe!1172
| * | | fix oopsShpuld Shpuldson2020-07-28
| | | |
| * | | fix non-timeline routes breaking current/previous timelineShpuld Shpuldson2020-07-28
| | | |
| * | | resume last lasttime instead of always friends/publicShpuld Shpuldson2020-07-23
| | | |
| * | | fix missed conflictShpuld Shpuldson2020-07-14
| | | |
| * | | fix merge conflictsShpuld Shpuldson2020-07-14
| |\ \ \
| * | | | fix pixel offset hack in panel headingShpuld Shpuldson2020-07-09
| | | | |
| * | | | add hack to not overlap menu with timeline headerShpuld Shpuldson2020-07-08
| | | | |
| * | | | update navigation, rename timeline link in nav panel to timelinesShpuld Shpuldson2020-07-07
| | | | |
| * | | | update with bookmarks, clean up some codeShpuld Shpuldson2020-07-07
| |\ \ \ \