aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'pleroma/develop' into ↵Ilja2022-03-26
|\ | | | | | | improve_delete_user_confirmation_message
| * Merge branch 'from/develop/tusooa/fix-overlap-button' into 'develop'HJ2022-03-25
| |\ | | | | | | | | | | | | Fix overlapping buttons in Theme settings See merge request pleroma/pleroma-fe!1488
| | * Remove debugging codeHJ2022-03-25
| | |
| | * Fix overlapping buttons in Theme settingsTusooa Zhu2022-03-24
| |/
| * Merge branch 'renovate/ruffle-mirror-2021.x' into 'develop'HJ2022-03-24
| |\ | | | | | | | | | | | | Update dependency ruffle-mirror to v2021.12.31 See merge request pleroma/pleroma-fe!1486
| | * Update dependency ruffle-mirror to v2021.12.31Pleroma Renovate Bot2022-03-24
| |/
| * Merge branch 'renovate/babel-monorepo' into 'develop'HJ2022-03-23
| |\ | | | | | | | | | | | | Update dependency babel-loader to v8.2.4 See merge request pleroma/pleroma-fe!1484
| | * Update dependency babel-loader to v8.2.4Pleroma Renovate Bot2022-03-23
| |/
| * Merge branch 'fix-avatars3' into 'develop'HJ2022-03-22
| |\ | | | | | | | | | | | | quick fix for alignment in avatars See merge request pleroma/pleroma-fe!1483
| | * quick fix for alignment in avatars, juggling multiple branches is confusingHenry Jameson2022-03-22
| |/
| * Merge branch 'renovate/mini-css-extract-plugin-0.x' into 'develop'HJ2022-03-22
| |\ | | | | | | | | | | | | Update dependency mini-css-extract-plugin to v0.12.0 See merge request pleroma/pleroma-fe!1480
| | * Update dependency mini-css-extract-plugin to v0.12.0Pleroma Renovate Bot2022-03-22
| | |
| * | Merge branch 'fix-avatars2' into 'develop'HJ2022-03-22
| |\ \ | | | | | | | | | | | | | | | | fix even more issues with avatars See merge request pleroma/pleroma-fe!1482
| | * \ Merge branch 'develop' into 'fix-avatars2'HJ2022-03-22
| | |\ \ | | |/ / | |/| | | | | | # Conflicts: # src/components/status/status.scss
| * | | Merge branch 'renovate/ora-0.x' into 'develop'HJ2022-03-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency ora to v0.4.1 See merge request pleroma/pleroma-fe!1481
| | * | | Update dependency ora to v0.4.1Pleroma Renovate Bot2022-03-22
| | | |/ | | |/|
| * | | Merge branch 'renovate/karma-firefox-launcher-1.x' into 'develop'HJ2022-03-22
| |\ \ \ | | |/ / | |/| | | | | | | | | | Update dependency karma-firefox-launcher to v1.3.0 See merge request pleroma/pleroma-fe!1475
| | * | Update dependency karma-firefox-launcher to v1.3.0Pleroma Renovate Bot2022-03-22
| |/ /
| * | Merge branch 'fix-mobile-avatars' into 'develop'HJ2022-03-22
| |\ \ | | | | | | | | | | | | | | | | fix avatars in mobile view See merge request pleroma/pleroma-fe!1479
| | * | fix avatars in mobile viewHenry Jameson2022-03-22
| | | |
| | | * fix even more issues with avatarsHenry Jameson2022-03-22
| | |/ | |/|
| * | Merge branch 'bot-indicator-fixes' into 'develop'HJ2022-03-21
| |\ \ | | | | | | | | | | | | | | | | Bot indicator fixes See merge request pleroma/pleroma-fe!1477
| | * | improve the looks of bot indicatorHenry Jameson2022-03-21
| | | |
| | * | fix bot indicator appearing on retweeter avatarHenry Jameson2022-03-21
| | | |
| * | | Merge branch 'renovate/localforage-1.x' into 'develop'HJ2022-03-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency localforage to v1.10.0 See merge request pleroma/pleroma-fe!1476
| | * | | Update dependency localforage to v1.10.0Pleroma Renovate Bot2022-03-21
| | | | |
| * | | | Merge branch 'renovate/eslint-plugin-standard-4.x' into 'develop'HJ2022-03-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency eslint-plugin-standard to v4.1.0 See merge request pleroma/pleroma-fe!1471
| | * | | | Update dependency eslint-plugin-standard to v4.1.0Pleroma Renovate Bot2022-03-21
| | |/ / /
| * | | | Merge branch 'renovate/babel-monorepo' into 'develop'HJ2022-03-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update babel monorepo to v7.17.8 See merge request pleroma/pleroma-fe!1469
| | * | | | Update babel monorepo to v7.17.8Pleroma Renovate Bot2022-03-21
| | |/ / /
| * | | | Merge branch 'renovate/http-proxy-middleware-0.x' into 'develop'HJ2022-03-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency http-proxy-middleware to v0.21.0 See merge request pleroma/pleroma-fe!1473
| | * | | | Update dependency http-proxy-middleware to v0.21.0Pleroma Renovate Bot2022-03-21
| | |/ / /
| * | | | Merge branch 'renovate/eslint-plugin-import-2.x' into 'develop'HJ2022-03-21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Update dependency eslint-plugin-import to v2.25.4 See merge request pleroma/pleroma-fe!1468
| | * | | Update dependency eslint-plugin-import to v2.25.4Pleroma Renovate Bot2022-03-21
| |/ / /
| * | | Merge branch 'renovate/eslint-loader-2.x' into 'develop'HJ2022-03-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency eslint-loader to v2.2.1 See merge request pleroma/pleroma-fe!1467
| | * | | Update dependency eslint-loader to v2.2.1Pleroma Renovate Bot2022-03-18
| | |/ /
| * | | Merge branch 'renovate/eslint-plugin-promise-4.x' into 'develop'HJ2022-03-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency eslint-plugin-promise to v4.3.1 See merge request pleroma/pleroma-fe!1470
| | * | | Update dependency eslint-plugin-promise to v4.3.1Pleroma Renovate Bot2022-03-19
| | |/ /
| * | | Merge branch 'renovate/express-4.x' into 'develop'HJ2022-03-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency express to v4.17.3 See merge request pleroma/pleroma-fe!1472
| | * | | Update dependency express to v4.17.3Pleroma Renovate Bot2022-03-20
| | |/ /
| * | | Merge branch 'renovate/iso-639-1-2.x' into 'develop'HJ2022-03-21
| |\ \ \ | | |/ / | |/| | | | | | | | | | Update dependency iso-639-1 to v2.1.13 See merge request pleroma/pleroma-fe!1474
| | * | Update dependency iso-639-1 to v2.1.13Pleroma Renovate Bot2022-03-21
| |/ /
| * | Merge branch 'renovate/cropperjs-1.x' into 'develop'HJ2022-03-18
| |\ \ | | | | | | | | | | | | | | | | Update dependency cropperjs to v1.5.12 See merge request pleroma/pleroma-fe!1465
| | * | Update dependency cropperjs to v1.5.12Pleroma Renovate Bot2022-03-17
| | |/
| * | Merge branch 'renovate/body-scroll-lock-2.x' into 'develop'HJ2022-03-18
| |\ \ | | | | | | | | | | | | | | | | Update dependency body-scroll-lock to v2.7.1 See merge request pleroma/pleroma-fe!1464
| | * | Update dependency body-scroll-lock to v2.7.1Pleroma Renovate Bot2022-03-17
| | |/
| * | Merge branch 'renovate/babel-monorepo' into 'develop'HJ2022-03-17
| |\ \ | | |/ | |/| | | | | | | Update babel monorepo See merge request pleroma/pleroma-fe!1462
| | * Update babel monorepoPleroma Renovate Bot2022-03-17
| |/
| * Merge branch 'expert-settings-and-serverside' into 'develop'HJ2022-03-16
| |\ | | | | | | | | | | | | Expert settings and serverside settings + new defaults See merge request pleroma/pleroma-fe!1438
| | * Apply 1 suggestion(s) to 1 file(s)HJ2022-03-16
| | |