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

6155 Commits

Author SHA1 Message Date
Your New SJW Waifu 63bd5472a4 give @roboneko cat ears 2021-08-26 11:17:04 -05:00
Your New SJW Waifu 539d5d2b82 built different 2021-08-26 11:14:26 -05:00
Your New SJW Waifu 7a08af9dfd Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-08-26 11:09:56 -05:00
Shpuld Shpludson 4686993334 Merge branch 'shpuld-develop-patch-10585' into 'develop' 
Update CHANGELOG.md for 2.4.0

See merge request pleroma/pleroma-fe!1405
 2021-08-08 12:47:25 +00:00
Shpuld Shpludson 435f80133a Update CHANGELOG.md for 2.4.0 2021-08-08 12:38:51 +00:00
Your New SJW Waifu 46533b4a74 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-07-20 12:23:39 -05:00
Shpuld Shpludson 425919a0d2 Merge branch 'fix-themes-select' into 'develop' 
Fix theme select not working

See merge request pleroma/pleroma-fe!1393
 2021-07-19 18:33:19 +00:00
HJ ba961b784f Apply 1 suggestion(s) to 1 file(s) 2021-07-19 17:10:13 +00:00
Shpuld Shpludson 891611816c Merge branch 'editProfile' into 'develop' 
Minor change: Add edit profile button onto self user card

See merge request pleroma/pleroma-fe!1398
 2021-07-19 16:35:28 +00:00
Shpuld Shpludson 373b14e1e4 Merge branch 'fix-settings-anon' into 'develop' 
Fix Boolean/Choice settings not working properly on initial launch

See merge request pleroma/pleroma-fe!1389
 2021-07-19 16:11:11 +00:00
Your New SJW Waifu 773190cd12 convert the children 2021-07-14 12:56:39 -05:00
Your New SJW Waifu 185597c8ad Merge branch 'new-bloop' into 'neckbeard' 
New bloop

See merge request sjw/pleroma-fe!12
 2021-07-14 17:48:19 +00:00
Your New SJW Waifu 37270be668 Merge remote-tracking branch 'origin/neckbeard' into new-bloop 2021-07-14 12:46:19 -05:00
Your New SJW Waifu 827b00484e thud 2021-07-14 12:42:17 -05:00
Your New SJW Waifu b126a81269 Merge branch 'cat-erars-names' into 'neckbeard' 
give shiyu cat ears

See merge request sjw/pleroma-fe!11
 2021-07-02 06:22:36 +00:00
Your New SJW Waifu 6ba22e191f give shiyu cat ears 2021-07-02 01:10:53 -05:00
Your New SJW Waifu 56f790c160 give @shiyu cat ears 2021-07-01 20:23:51 -05:00
Your New SJW Waifu 930a63b938 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-06-23 10:08:13 -05:00
HJ 19475ba356 Merge branch 'develop' into 'develop' 
Bug fix: Fix follow request count position on mobile

See merge request pleroma/pleroma-fe!1400
 2021-06-20 09:09:32 +00:00
Eris cd9dd352e3 Fix follow request count position on mobile 2021-06-20 06:27:32 +00:00
Eris 85e2f8f78c Don't show profile edit button in sidebar 2021-06-17 20:57:23 +00:00
eris b2ebfc1fd6 Merge branch 'develop' into 'editProfile' 
# Conflicts:
#   CHANGELOG.md
 2021-06-17 19:35:09 +00:00
Eris e1361a1cae Add edit profile button 2021-06-17 19:29:58 +00:00
HJ 338134acfb Merge branch 'hideShoutbox' into 'develop' 
New user option: Hide floating shoutbox

See merge request pleroma/pleroma-fe!1396
 2021-06-15 21:32:20 +00:00
Eris d7a53aec61 Use proper setting name 2021-06-15 18:09:00 +00:00
Eris 7e3393b5a2 Use cleaner instance config check for shoutbox setting 2021-06-15 00:59:36 +00:00
Eris 5047663c51 Make locale language cleaner 2021-06-15 00:25:09 +00:00
Eris cbccea0546 Don't shorten shoutbox to SB 2021-06-14 20:33:51 +00:00
Eris 1668315bf8 Fix lint error 2021-06-14 20:02:13 +00:00
Eris 1fcccd7570 Update CHANGELOG.md 2021-06-14 19:43:47 +00:00
Eris 0c10145242 New option: Hide shoutbox 2021-06-14 19:42:56 +00:00
Henry Jameson 63c22ad131 Fixed mergedConfig misbehaving on first boot 2021-06-14 10:58:32 +03:00
Your New SJW Waifu be363f13f4 update tracker mod 2021-06-10 16:51:37 -05:00
Your New SJW Waifu 0e4752d36f update mod loader 2021-06-10 16:50:54 -05:00
Your New SJW Waifu f2f8b2d7bc needs to be more bigger 2021-06-10 14:40:17 -05:00
Your New SJW Waifu b22e5ed6d7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-06-10 14:35:33 -05:00
Henry Jameson 38d9ea8b17 lint 2021-06-08 00:09:16 +03:00
Henry Jameson 59d046b163 fix theme selection not working 2021-06-07 23:48:46 +03:00
HJ 2725a0c639 Merge branch 'chore/rename-chat' into 'develop' 
Rename legacy PleromaFE Chat functionality to "Shout"

See merge request pleroma/pleroma-fe!1207
 2021-06-03 20:16:48 +00:00
Mark Felder bd98ecb3f0 Remove unused shoutbox channel state from side drawer 2021-06-03 15:07:02 -05:00
Mark Felder 21477d07e9 This setting didn't actually do anything 2021-06-01 16:51:47 -05:00
Mark Felder ed824d964e Use old value to discover if Shoutbox is available until we ship a new release that's declaring the feature as "shout" 2021-06-01 16:48:40 -05:00
Mark Felder e0cde9a29b Keep channel name the same for backwards compatibility 2021-06-01 14:31:58 -05:00
Mark Felder 0604b1d5b7 Rename legacy PleromaFE Chat functionality to "Shout" 2021-06-01 12:51:20 -05:00
Henry Jameson 32d1a0e181 better approach 2021-05-31 14:23:57 +03:00
HJ 7bd18cda64 Merge branch 'vue3compat-emoji-input' into 'develop' 
Refactor EmojiInput for better vue3 compatibility

See merge request pleroma/pleroma-fe!1382
 2021-05-31 11:17:42 +00:00
Henry Jameson e95412a03c fix BooleanSetting and ChoiceSetting not working properly on initial 
launch as anon visitor (would show all as changed, empty selects)
 2021-05-31 14:16:37 +03:00
HJ 0ca0e642a4 Merge branch 'v-slot-upgrade' into 'develop' 
Change old slot syntax (removed in vue3) to new one

See merge request pleroma/pleroma-fe!1379
 2021-05-31 11:15:44 +00:00
HJ 4e96af0442 Merge branch 'better-selects' into 'develop' 
Better <select> components

See merge request pleroma/pleroma-fe!1373
 2021-05-31 11:08:56 +00:00
Henry Jameson 80220c1b07 fix warnings 2021-05-31 14:08:12 +03:00