sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6388 commits 3 branches 15 tags 109 MiB
Commit graph

174 commits

Author SHA1 Message Date
Sam Therapy
6e24a983e2
Pull from develop, again
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Also remove english-nyan because that shit broken

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-05-26 20:18:02 +02:00
HJ
9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'" 
This reverts merge request !1526
 2022-05-22 16:40:59 +00:00
HJ
069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'" 
This reverts merge request !1494
 2022-05-22 16:38:09 +00:00
HJ
a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop' 
Add language options

See merge request pleroma/pleroma-fe!1494
 2022-05-22 16:35:51 +00:00
HJ
396349fdf2 Merge branch 'renovate/semver-5.x' into 'develop' 
Update dependency semver to v5.7.1

See merge request pleroma/pleroma-fe!1491
 2022-05-22 16:31:35 +00:00
HJ
62fcc16546 Merge branch 'renovate/webpack-merge-0.x' into 'develop' 
Update dependency webpack-merge to v0.20.0

See merge request pleroma/pleroma-fe!1496
 2022-05-22 16:29:39 +00:00
Pleroma Renovate Bot
45614b8804 Update dependency @vuelidate/core to v2.0.0-alpha.41 2022-05-02 09:06:51 +00:00
Tusooa Zhu
a5e861cd01
Set userLanguage cookie when setting interface language 2022-04-29 20:34:29 -04:00
Sam Therapy
16ee0077a5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-04-08 15:58:06 +02:00
Henry Jameson
78817e37f7 force runtime build of i18n 2022-04-06 11:43:30 +03:00
Henry Jameson
2b0dd2cbae fix CSP by compiling the i18n templates as well 2022-04-05 23:45:26 +03:00
Absturztaube
5ce9136d89 resolve merge conflicts 2022-04-03 19:03:36 +02:00
Tusooa Zhu
a3233e31d0
Fix phoenix at 1.6.2 
According to https://github.com/phoenixframework/phoenix/issues/4623 ,
1.6.2 seems to not have the disconnection bug.
 2022-04-01 08:44:18 -04:00
Pleroma Renovate Bot
8a55f21a98 Update dependency webpack-merge to v0.20.0 2022-04-01 09:08:00 +00:00
Pleroma Renovate Bot
c7d8cff7b3 Update dependency semver to v5.7.1 2022-04-01 09:07:15 +00:00
Henry Jameson
e80e53d9d2 Merge branch 'vue3-again' into vue3-no-compat 
* vue3-again:
  re-fix i18n warnings again
  fix qr code
 2022-03-29 16:00:56 +03:00
Henry Jameson
3171241c6f fix qr code 2022-03-29 15:44:42 +03:00
Henry Jameson
3e0bb91ff2 Merge branch 'vue3-again' into vue3-no-compat 
* vue3-again:
  lint + fixes for registration
  fix production build's reply not working in tree mode
  lock down version?
  manual lint
  Revert "fix weird thing i somehow missed"
  Revert "lint"
  fix weird thing i somehow missed
  lint
 2022-03-29 15:35:47 +03:00
Henry Jameson
3f04ebd89a lock down version? 2022-03-29 12:27:59 +03:00
Henry Jameson
dc8bef7928 remove compat build 2022-03-29 00:58:17 +03:00
Henry Jameson
8e711e0587 get rid of portal-vue 2022-03-27 12:59:15 +03:00
Henry Jameson
d6bbccdd71 Merge remote-tracking branch 'origin/develop' into vue3-again 
* origin/develop:
  Remove debugging code
  Fix overlapping buttons in Theme settings
  Update dependency ruffle-mirror to v2021.12.31
  Update dependency babel-loader to v8.2.4
 2022-03-27 12:50:00 +03:00
Pleroma Renovate Bot
20c14a1d99 Update dependency ruffle-mirror to v2021.12.31 2022-03-24 09:05:00 +00:00
Henry Jameson
322ec8681a cleanup 2022-03-23 15:44:37 +02:00
Pleroma Renovate Bot
db0e1a2534 Update dependency babel-loader to v8.2.4 2022-03-23 09:05:04 +00:00
Henry Jameson
c3546ea856 fix tests running 2022-03-22 18:22:23 +02:00
Henry Jameson
c6a4a0a320 Merge remote-tracking branch 'origin/develop' into vue3-again 
* origin/develop:
  quick fix for alignment in avatars, juggling multiple branches is confusing
  fix even more issues with avatars
  Update dependency ora to v0.4.1
  Update dependency mini-css-extract-plugin to v0.12.0
  Update dependency karma-firefox-launcher to v1.3.0
  fix avatars in mobile view
 2022-03-22 12:14:02 +02:00
HJ
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
HJ
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
Pleroma Renovate Bot
623aa3d20d Update dependency ora to v0.4.1 2022-03-22 09:06:15 +00:00
Pleroma Renovate Bot
636a55e72d Update dependency mini-css-extract-plugin to v0.12.0 2022-03-22 09:06:08 +00:00
Pleroma Renovate Bot
304f871332 Update dependency karma-firefox-launcher to v1.3.0 2022-03-22 09:06:00 +00:00
Henry Jameson
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
HJ
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
HJ
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
HJ
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
HJ
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
Pleroma Renovate Bot
4f2be206df Update dependency localforage to v1.10.0 2022-03-21 18:16:34 +00:00
Pleroma Renovate Bot
6074ad67ab Update dependency http-proxy-middleware to v0.21.0 2022-03-21 18:16:06 +00:00
Pleroma Renovate Bot
c5cb76ac3b Update dependency eslint-plugin-standard to v4.1.0 2022-03-21 18:15:53 +00:00
Pleroma Renovate Bot
e4b010321d Update dependency eslint-plugin-import to v2.25.4 2022-03-21 18:15:39 +00:00
Pleroma Renovate Bot
5e4ff5de7c Update babel monorepo to v7.17.8 2022-03-21 18:15:22 +00:00
HJ
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
HJ
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
HJ
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
Pleroma Renovate Bot
89d6e624f2 Update dependency iso-639-1 to v2.1.13 2022-03-21 09:07:38 +00:00
Pleroma Renovate Bot
060aa41f35 Update dependency express to v4.17.3 2022-03-20 09:05:19 +00:00
Pleroma Renovate Bot
67f5cf3c03 Update dependency eslint-plugin-promise to v4.3.1 2022-03-19 09:07:04 +00:00
Pleroma Renovate Bot
5d973df5bd Update dependency eslint-loader to v2.2.1 2022-03-18 09:04:52 +00:00
Henry Jameson
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