Absturztaube
5ce9136d89
resolve merge conflicts
2022-04-03 19:03:36 +02:00
HJ
a613447105
Merge branch 'from/develop/tusooa/phoenix-1.6.2' into 'develop'
...
Fix phoenix at 1.6.2
See merge request pleroma/pleroma-fe!1502
2022-04-01 13:03:13 +00: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
HJ
f71f101fce
Merge branch 'vue3-again' into 'develop'
...
Migration to Vue 3 (again)
See merge request pleroma/pleroma-fe!1385
2022-03-31 17:45:29 +00:00
HJ
afdc61b9b7
Merge branch 'vue3-no-compat' into 'vue3-again'
...
Remove Vue3 compat build
See merge request pleroma/pleroma-fe!1500
2022-03-31 17:39:08 +00:00
HJ
1d1ea7e703
Merge branch 'from/develop/tusooa/fix-feat-shoutbox-en' into 'develop'
...
Fix English translation of Shoutbox in features panel
See merge request pleroma/pleroma-fe!1489
2022-03-30 21:40:19 +00:00
Henry Jameson
052ad2fe3f
Merge branch 'vue3-again' into vue3-no-compat
...
* vue3-again:
oops
2022-03-30 23:54:21 +03:00
Henry Jameson
a0099ecb66
oops
2022-03-30 23:54:11 +03:00
Henry Jameson
9940739f1f
Merge branch 'vue3-again' into vue3-no-compat
...
* vue3-again:
fix some mishaps i noticed during self-review
2022-03-30 23:52:24 +03:00
Henry Jameson
afbe1a96ac
fix some mishaps i noticed during self-review
2022-03-30 23:48:06 +03:00
Henry Jameson
e029c2864f
Merge branch 'vue3-again' into vue3-no-compat
...
* vue3-again:
fix importer
2022-03-30 18:00:48 +03:00
Henry Jameson
dadf2f407f
fix importer
2022-03-30 18:00:37 +03:00
Henry Jameson
6751c22a23
Merge branch 'vue3-again' into vue3-no-compat
...
* vue3-again:
make all clickable icons into actual buttons
2022-03-30 13:13:41 +03:00
Henry Jameson
1943991077
make all clickable icons into actual buttons
2022-03-30 12:34:27 +03:00
Henry Jameson
115170f35d
Merge branch 'vue3-again' into vue3-no-compat
...
* vue3-again:
fix emoji input warning spam
fix error clear icon
Add controlledShowingLongSubject and toggle in StatusContent props
2022-03-30 01:26:35 +03:00
Henry Jameson
c3690b456e
fix emoji input warning spam
2022-03-30 01:24:53 +03:00
Henry Jameson
70593e71e6
fix error clear icon
2022-03-30 01:24:17 +03:00
HJ
1c60609547
Merge branch 'vue3-again' into 'vue3-again'
...
Add controlledShowingLongSubject and toggle in StatusContent props
See merge request pleroma/pleroma-fe!1499
2022-03-29 18:13:27 +00:00
Tusooa Zhu
b84acfd7b7
Add controlledShowingLongSubject and toggle in StatusContent props
2022-03-29 13:56:42 -04:00
Henry Jameson
97e072d93a
how did this get back??
2022-03-29 20:23:44 +03:00
Henry Jameson
2179054384
Merge branch 'vue3-again' into vue3-no-compat
...
* vue3-again:
fix warning about custom component
fix?
fix some issues with trees
removing uselsess stuff
fix reset buttons in profile again
fix spacing in poll expiration label
registration fixes
2022-03-29 20:00:59 +03:00
Henry Jameson
a3f48fc3f4
fix warning about custom component
2022-03-29 19:55:30 +03:00
Henry Jameson
de2f968645
fix?
2022-03-29 19:44:07 +03:00
Henry Jameson
e1483488c7
fix some issues with trees
2022-03-29 19:23:30 +03:00
Henry Jameson
a1822f073d
removing uselsess stuff
2022-03-29 19:21:13 +03:00
Henry Jameson
218b15b5fd
fix reset buttons in profile again
2022-03-29 19:12:57 +03:00
Henry Jameson
bc029b0fa2
fix spacing in poll expiration label
2022-03-29 19:04:01 +03:00
Henry Jameson
2d7f242713
remove unused props to fix test
2022-03-29 16:33:34 +03:00
Henry Jameson
0afc955ebd
registration fixes
2022-03-29 16:08:57 +03: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
afcfcce2e6
re-fix i18n warnings again
2022-03-29 15:46:21 +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
5bbc0e0bb5
lint + fixes for registration
2022-03-29 15:35:18 +03:00
Henry Jameson
3799983d4f
fix production build's reply not working in tree mode
2022-03-29 12:43:42 +03:00
Henry Jameson
3f04ebd89a
lock down version?
2022-03-29 12:27:59 +03:00
Henry Jameson
b93e5437bd
manual lint
2022-03-29 12:04:09 +03:00
Henry Jameson
64d56e6515
Revert "fix weird thing i somehow missed"
...
This reverts commit b132581b3a
2022-03-29 11:59:00 +03:00
Henry Jameson
d9d4d8954e
Revert "lint"
...
This reverts commit f20ae34400
2022-03-29 11:57:54 +03:00
Henry Jameson
b132581b3a
fix weird thing i somehow missed
2022-03-29 11:47:22 +03:00
Henry Jameson
f20ae34400
lint
2022-03-29 01:04:37 +03:00
Henry Jameson
dc8bef7928
remove compat build
2022-03-29 00:58:17 +03:00
Henry Jameson
650e69c336
fix misc warnings
2022-03-29 00:02:02 +03:00
Henry Jameson
f21dc21a83
properly implement resettableAsyncComponent
2022-03-28 23:55:57 +03:00
Henry Jameson
9afbb12f95
fix opacity control again
2022-03-28 23:55:11 +03:00
Henry Jameson
7b10e47b21
rename some binding hooks according to new names
2022-03-28 23:54:30 +03:00
Henry Jameson
4b630c3c36
fix warnings
2022-03-28 17:37:26 +03:00
Henry Jameson
bdd240a230
fix some more warnings
2022-03-28 17:21:42 +03:00
Henry Jameson
c57af7e242
remove some warnings
2022-03-28 17:13:48 +03:00
Henry Jameson
f706234d77
fix being unable to set/reset background (and possibly avatar/banner)
2022-03-28 15:01:34 +03:00
