sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
7,031 Commits 159 Branches 3 Tags 443 MiB
Commit Graph

7031 Commits

Author SHA1 Message Date
Your New SJW Waifu 952a996399 Merge branch 'remove-mods' into 'neckbeard' 
Don't load mods

See merge request sjw/pleroma-fe!14
 2022-06-26 15:29:02 +00:00
Your New SJW Waifu d902454307 remove mods 2022-06-26 10:23:11 -05:00
Your New SJW Waifu 5ff6847db2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-21 11:55:57 -05:00
HJ 56501e95c4 Merge branch 'from/develop/tusooa/migration-ui' into 'develop' 
Add ui for account migration

See merge request pleroma/pleroma-fe!1414
 2022-06-19 20:35:58 +00:00
HJ 0e65253360 Merge branch 'improve_delete_user_confirmation_message' into 'develop' 
Explain better what delete does in moderation menu

See merge request pleroma/pleroma-fe!1453
 2022-06-19 20:32:27 +00:00
HJ 5ad7dc7835 Merge branch 'from/develop/tusooa/backup-ui' into 'develop' 
Add ui for backup

See merge request pleroma/pleroma-fe!1520
 2022-06-19 20:31:19 +00:00
HJ b4006bf4f0 Merge branch 'translation-sk' into 'develop' 
add SK (Slovak) translation

See merge request pleroma/pleroma-fe!1517
 2022-06-19 20:29:25 +00:00
k2s c1ee78756c add SK (Slovak) translation 2022-06-19 20:29:24 +00:00
HJ da022e722e Merge branch 'from/develop/tusooa/unit-pl' into 'develop' 
Use vue-i18n to determine plural forms of time units

Closes #1164

See merge request pleroma/pleroma-fe!1535
 2022-06-19 20:28:29 +00:00
HJ 2b10fe06fa Merge branch 'from/develop/tusooa/show-underlay-mobile' into 'develop' 
Show underlay for mobile

See merge request pleroma/pleroma-fe!1536
 2022-06-19 20:26:55 +00:00
HJ 4452a14c77 Merge branch 'from/develop/tusooa/topbar-input-text' into 'develop' 
Fix top bar input text colour

See merge request pleroma/pleroma-fe!1538
 2022-06-19 20:26:24 +00:00
HJ 6fb483955e Merge branch 'fix-mobile-emoji-search' into 'develop' 
EmojiPicker: Workaround to search immediately on mobile

See merge request pleroma/pleroma-fe!1539
 2022-06-19 20:25:43 +00:00
Lain Soykaf 67a9452e11 ReactButton: Workaround for android composition mode 2022-06-12 13:48:21 +02:00
Lain Soykaf 9c8738ff22 EmojiPicker: Workaround to search immediately on mobile 
See https://github.com/vuejs/vue/pull/9814
 2022-06-12 13:38:12 +02:00
Tusooa Zhu 31571361d3
Fix top bar input text colour 2022-06-11 18:18:27 -04:00
Your New SJW Waifu c456ed9f80 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-08 15:56:02 -05:00
Tusooa Zhu 1ce78435c4
Show underlay for mobile 2022-06-07 21:48:34 -04:00
Tusooa Zhu 13cff692f0
Fix tests 2022-06-07 20:34:08 -04:00
Tusooa Zhu 772ddade21
Add English translations for correctly i18nized time units 2022-06-07 20:22:25 -04:00
Tusooa Zhu c17de10d3a
Delegate relativeTime plural rules to vue-i18n 2022-06-07 20:22:03 -04:00
HJ 15229d27b4 Merge branch '3c-fixes' into 'develop' 
restore notifications page, fix z-index issues

Closes #1166

See merge request pleroma/pleroma-fe!1534
 2022-06-07 13:59:07 +00:00
Henry Jameson 9b5fe24ca4 restore notifications page, fix z-index issues 2022-06-07 16:52:03 +03:00
Your New SJW Waifu 176479db0e remove banner for now 2022-06-01 10:00:17 -05:00
Your New SJW Waifu 93515aa533 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-01 09:55:18 -05:00
HJ 0aa334515b Merge branch 'threecolumn' into 'develop' 
Layout refactoring + Three column mode

See merge request pleroma/pleroma-fe!1503
 2022-05-31 17:46:59 +00:00
HJ 1418054b53 Merge branch 'from/develop/tusooa/fix-open-chat' into 'develop' 
Fix Open Chat button

See merge request pleroma/pleroma-fe!1532
 2022-05-31 17:46:31 +00:00
Henry Jameson a63aeccbcc force panel headers to be square on mobile (for now?) 2022-05-31 20:35:30 +03:00
Henry Jameson 58b8217283 fix gap between panel heading and timeline menu 2022-05-31 20:28:47 +03:00
Your New SJW Waifu 9475b1a7d5 bring back the cats 2022-05-27 09:53:57 -05:00
Your New SJW Waifu 98dc169e46 Update mods 2022-05-27 09:48:57 -05:00
Your New SJW Waifu 8e0ca4b8a9 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-27 09:45:11 -05:00
Tusooa Zhu 152302cbff
Fix Open Chat button 2022-05-25 13:35:09 -04:00
Henry Jameson c3c120e91d fix? 2022-05-22 21:50:30 +03:00
Henry Jameson 1feff4dcc7 fix 2022-05-22 21:47:19 +03:00
HJ 48c739027c Merge branch 'from/develop/tusooa/lang-opts' into 'develop' 
Fix registration error

See merge request pleroma/pleroma-fe!1527
 2022-05-22 16:41:37 +00:00
HJ 68a2c5db98 Merge branch 'revert-3b6d72ef' into 'develop' 
Revert "Merge branch 'revert-a88abc7e' into 'develop'"

See merge request pleroma/pleroma-fe!1528
 2022-05-22 16:41:16 +00:00
HJ 9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'" 
This reverts merge request !1526
 2022-05-22 16:40:59 +00:00
HJ 3b6d72ef3b Merge branch 'revert-a88abc7e' into 'develop' 
Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"

See merge request pleroma/pleroma-fe!1526
 2022-05-22 16:38:21 +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
Tusooa Zhu 79ee77a6fe
Fix registration error 2022-05-22 12:37:38 -04: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
HJ dfc166c1ff Merge branch 'renovate/vuelidate-core-2.x' into 'develop' 
Update dependency @vuelidate/core to v2.0.0-alpha.41

See merge request pleroma/pleroma-fe!1501
 2022-05-22 16:28:24 +00:00
HJ 48f97ebf40 Merge branch 'eientei-pass-avatar-file-name' into 'develop' 
Pass file name of cropped avatar to form data

See merge request pleroma/pleroma-fe!1522
 2022-05-22 16:25:46 +00:00
HJ 3287ce9453 Merge branch 'from/develop/tusooa/poll-notif' into 'develop' 
Poll-end notifications

See merge request pleroma/pleroma-fe!1524
 2022-05-22 16:25:22 +00:00
Henry Jameson d137d5800a stick chat scroll to bottom to help with OSK resizing the viewport 2022-05-22 12:18:20 +03:00
Alexander Tumin 29b084b4b8 Pass file name of cropped avatar to form data 2022-05-21 19:44:44 +03:00
Tusooa Zhu 6e0ceda968
Add English translation for filtering end-of-poll notifications 
Ref: poll-notif
 2022-05-20 16:45:34 -04:00
Tusooa Zhu a35daceb5b
Add settings for filtering end-of-poll notifications 
Ref: poll-notif
 2022-05-20 16:45:33 -04:00