6a31962ca0
Merge branch 'fix-avatars3' into 'develop'
...
quick fix for alignment in avatars
See merge request pleroma/pleroma-fe!1483
2022-03-22 10:03:17 +00:00
fa99abf106
quick fix for alignment in avatars, juggling multiple branches is confusing
2022-03-22 11:57:21 +02:00
9be06d9f71
Merge branch 'renovate/mini-css-extract-plugin-0.x' into 'develop'
...
Update dependency mini-css-extract-plugin to v0.12.0
See merge request pleroma/pleroma-fe!1480
2022-03-22 09:54:23 +00:00
966919874e
Merge branch 'fix-avatars2' into 'develop'
...
fix even more issues with avatars
See merge request pleroma/pleroma-fe!1482
2022-03-22 09:53:13 +00:00
a253c95170
Merge branch 'develop' into 'fix-avatars2'
...
# Conflicts:
# src/components/status/status.scss
2022-03-22 09:47:24 +00:00
c6e0dcf08e
fix even more issues with avatars
2022-03-22 11:43:51 +02:00
0147226b3d
Merge branch 'renovate/ora-0.x' into 'develop'
...
Update dependency ora to v0.4.1
See merge request pleroma/pleroma-fe!1481
2022-03-22 09:20:54 +00:00
1571053fba
Merge branch 'renovate/karma-firefox-launcher-1.x' into 'develop'
...
Update dependency karma-firefox-launcher to v1.3.0
See merge request pleroma/pleroma-fe!1475
2022-03-22 09:20:11 +00:00
623aa3d20d
Update dependency ora to v0.4.1
2022-03-22 09:06:15 +00:00
636a55e72d
Update dependency mini-css-extract-plugin to v0.12.0
2022-03-22 09:06:08 +00:00
304f871332
Update dependency karma-firefox-launcher to v1.3.0
2022-03-22 09:06:00 +00:00
2cd8a3ec8d
Merge branch 'fix-mobile-avatars' into 'develop'
...
fix avatars in mobile view
See merge request pleroma/pleroma-fe!1479
2022-03-22 08:24:42 +00:00
971cec024c
fix avatars in mobile view
2022-03-22 10:20:45 +02:00
7a17eb7fec
fix selects
2022-03-21 22:01:08 +02:00
4cb14c257c
fix expert mode checkbox not working
2022-03-21 21:34:55 +02:00
1187727b60
fix tabswitcher bugs
2022-03-21 21:29:51 +02:00
54fd7e2be6
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop:
improve the looks of bot indicator
fix bot indicator appearing on retweeter avatar
Update dependency localforage to v1.10.0
Update dependency http-proxy-middleware to v0.21.0
Update dependency eslint-plugin-standard to v4.1.0
Update dependency eslint-plugin-import to v2.25.4
Update babel monorepo to v7.17.8
Update dependency iso-639-1 to v2.1.13
Update dependency express to v4.17.3
Update dependency eslint-plugin-promise to v4.3.1
Update dependency eslint-loader to v2.2.1
2022-03-21 21:09:48 +02:00
0ef58696bf
Merge branch 'bot-indicator-fixes' into 'develop'
...
Bot indicator fixes
See merge request pleroma/pleroma-fe!1477
2022-03-21 19:04:21 +00:00
9478a462a7
improve the looks of bot indicator
2022-03-21 20:59:25 +02:00
4e2fd7baf9
fix bot indicator appearing on retweeter avatar
2022-03-21 20:39:56 +02:00
66fb3987d6
Merge branch 'renovate/localforage-1.x' into 'develop'
...
Update dependency localforage to v1.10.0
See merge request pleroma/pleroma-fe!1476
2022-03-21 18:27:24 +00:00
1e60a491c4
Merge branch 'renovate/eslint-plugin-standard-4.x' into 'develop'
...
Update dependency eslint-plugin-standard to v4.1.0
See merge request pleroma/pleroma-fe!1471
2022-03-21 18:26:27 +00:00
12ce58a5a0
Merge branch 'renovate/babel-monorepo' into 'develop'
...
Update babel monorepo to v7.17.8
See merge request pleroma/pleroma-fe!1469
2022-03-21 18:25:29 +00:00
2f24f3312d
Merge branch 'renovate/http-proxy-middleware-0.x' into 'develop'
...
Update dependency http-proxy-middleware to v0.21.0
See merge request pleroma/pleroma-fe!1473
2022-03-21 18:24:02 +00:00
1cc35b6df8
Merge branch 'renovate/eslint-plugin-import-2.x' into 'develop'
...
Update dependency eslint-plugin-import to v2.25.4
See merge request pleroma/pleroma-fe!1468
2022-03-21 18:19:24 +00:00
4f2be206df
Update dependency localforage to v1.10.0
2022-03-21 18:16:34 +00:00
6074ad67ab
Update dependency http-proxy-middleware to v0.21.0
2022-03-21 18:16:06 +00:00
c5cb76ac3b
Update dependency eslint-plugin-standard to v4.1.0
2022-03-21 18:15:53 +00:00
e4b010321d
Update dependency eslint-plugin-import to v2.25.4
2022-03-21 18:15:39 +00:00
5e4ff5de7c
Update babel monorepo to v7.17.8
2022-03-21 18:15:22 +00:00
6b14b645be
Merge branch 'renovate/eslint-loader-2.x' into 'develop'
...
Update dependency eslint-loader to v2.2.1
See merge request pleroma/pleroma-fe!1467
2022-03-21 18:13:00 +00:00
79258f61be
Merge branch 'renovate/eslint-plugin-promise-4.x' into 'develop'
...
Update dependency eslint-plugin-promise to v4.3.1
See merge request pleroma/pleroma-fe!1470
2022-03-21 18:10:10 +00:00
3ea442667f
Merge branch 'renovate/express-4.x' into 'develop'
...
Update dependency express to v4.17.3
See merge request pleroma/pleroma-fe!1472
2022-03-21 18:05:16 +00:00
6c120cc576
Merge branch 'renovate/iso-639-1-2.x' into 'develop'
...
Update dependency iso-639-1 to v2.1.13
See merge request pleroma/pleroma-fe!1474
2022-03-21 18:01:48 +00:00
89d6e624f2
Update dependency iso-639-1 to v2.1.13
2022-03-21 09:07:38 +00:00
060aa41f35
Update dependency express to v4.17.3
2022-03-20 09:05:19 +00:00
67f5cf3c03
Update dependency eslint-plugin-promise to v4.3.1
2022-03-19 09:07:04 +00:00
5948d20f00
mutes and blocks tab works
2022-03-18 13:36:08 +02:00
b3ed29ff02
made withLoadMore work... sorta
2022-03-18 13:32:36 +02:00
5d973df5bd
Update dependency eslint-loader to v2.2.1
2022-03-18 09:04:52 +00:00
26bfbdc2ad
fix sw compilation
2022-03-18 11:02:00 +02:00
50ea6dd142
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop:
Update dependency cropperjs to v1.5.12
Update dependency body-scroll-lock to v2.7.1
Update babel monorepo
2022-03-18 10:59:28 +02:00
6f1d953642
Merge branch 'renovate/cropperjs-1.x' into 'develop'
...
Update dependency cropperjs to v1.5.12
See merge request pleroma/pleroma-fe!1465
2022-03-18 08:58:03 +00:00
86f1b88d79
Merge branch 'renovate/body-scroll-lock-2.x' into 'develop'
...
Update dependency body-scroll-lock to v2.7.1
See merge request pleroma/pleroma-fe!1464
2022-03-18 08:57:08 +00:00
4610b6e547
Merge branch 'renovate/babel-monorepo' into 'develop'
...
Update babel monorepo
See merge request pleroma/pleroma-fe!1462
2022-03-17 09:11:07 +00:00
be02516776
Update dependency cropperjs to v1.5.12
2022-03-17 09:05:41 +00:00
4e100b9ea2
Update dependency body-scroll-lock to v2.7.1
2022-03-17 09:05:34 +00:00
8ae1f7e192
Update babel monorepo
2022-03-17 09:05:20 +00:00
fea0c91f74
bunp node version
2022-03-17 09:33:36 +02:00
051d51bcd9
fix suggest not working
2022-03-17 09:28:19 +02:00
HJ