d55bed41bf
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-09-09 10:48:20 -05:00
a8a82ad12f
Merge branch 'showMobileNewPost' into 'develop'
...
New user option: Always show floating New Post button
See merge request pleroma/pleroma-fe!1395
2021-09-09 12:19:53 +00:00
8af1f08539
Merge branch 'better-still-emoji' into 'develop'
...
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
2021-09-07 16:15:41 +00:00
2cfff1b8b9
remove new options for style and separate line, now groups all chained
...
mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 02:56:40 +03:00
179af131ee
Fix changelog merge conflict
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:46:41 +00:00
46533b4a74
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-07-20 12:23:39 -05:00
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
930a63b938
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-06-23 10:08:13 -05:00
b68fb7738b
Merge remote-tracking branch 'origin/develop' into better-still-emoji
...
* origin/develop:
Use proper setting name
Use cleaner instance config check for shoutbox setting
Make locale language cleaner
Don't shorten shoutbox to SB
Fix lint error
Update CHANGELOG.md
New option: Hide shoutbox
2021-06-18 02:27:57 +03:00
cab0095989
Merge branch 'develop' into 'showMobileNewPost'
...
# Conflicts:
# CHANGELOG.md
# src/App.js
2021-06-15 21:49:33 +00:00
4639e30cb8
Fix config naming for consistency
2021-06-14 20:41:34 +00:00
0c10145242
New option: Hide shoutbox
2021-06-14 19:42:56 +00:00
adfe56a3a3
New option: Always show floating New Post button
2021-06-14 17:54:40 +00:00
63c22ad131
Fixed mergedConfig misbehaving on first boot
2021-06-14 10:58:32 +03:00
f2f8b2d7bc
needs to be more bigger
2021-06-10 14:40:17 -05:00
b22e5ed6d7
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-06-10 14:35:33 -05:00
7ae85c8318
change defaults
2021-06-08 14:51:42 +03:00
9ea370033a
configurable mentions placement
2021-06-08 12:58:28 +03:00
5e83672274
fixed some strange error
2021-06-07 20:01:57 +03:00
22c8f71945
mention link
2021-06-07 18:41:47 +03:00
21477d07e9
This setting didn't actually do anything
2021-06-01 16:51:47 -05:00
e0cde9a29b
Keep channel name the same for backwards compatibility
2021-06-01 14:31:58 -05:00
0604b1d5b7
Rename legacy PleromaFE Chat functionality to "Shout"
2021-06-01 12:51:20 -05:00
7eabd4efad
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-05-28 09:42:21 -05:00
7341b8a551
Implement right sidebar option as user option
2021-05-26 22:22:55 +00:00
8ba9dc1d31
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-04-09 23:57:55 -05:00
8b96ea9377
Merge branch 'settings-import-export' into 'develop'
...
Settings backup/restore + small fixes
See merge request pleroma/pleroma-fe!1372
2021-04-07 17:40:07 +00:00
8ae73eff04
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-03-19 12:36:13 -05:00
d57ee274de
Merge branch 'feat/notification-quick-filters' into 'develop'
...
Add quick filters for notifications
See merge request pleroma/pleroma-fe!1364
2021-03-17 08:17:23 +00:00
19fc7dda9e
merge conflict, use v-slot:trigger, fix popover svg dimensions bug
2021-03-15 11:02:16 +02:00
a8967d85bd
streamlined WS flow, reduced spam amount related to WS reconnections
2021-03-09 02:38:10 +02:00
90afcd3420
WIP some work on making errors less spammy
2021-03-08 22:24:39 +02:00
2e7bd99444
Merge remote-tracking branch 'origin/develop' into websocket-fixes
...
* origin/develop: (119 commits)
Apply 1 suggestion(s) to 1 file(s)
Make it possible to localize user highlight options
remove shoutbox test hacks
fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
update changelog with 2.3.0
change icons around
Translated using Weblate (Japanese)
Update timeline_quick_settings.js
add screen_name_ui to tests
separate screen_name and screen_name_ui with decoded punycode
Update CHANGELOG.md
add basic validation for statusless status notifications
changelog mention
fix chat unread badge
update shelljs to get rid of warnings on build
save a few characters
focus input in emoji picker and react picker
fix vue warnings
add only to wording
basic loggedin check for reply filtering
...
2021-03-08 22:01:28 +02:00
3d95ea6acb
cleanup + fix
2021-03-08 21:56:20 +02:00
fada49768d
extra protection to not write what we don't know
2021-03-08 21:14:03 +02:00
dda95543e8
implemented import/export for themes
2021-03-08 19:53:30 +02:00
411ae0d9dc
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-03-04 07:53:35 -06:00
becacf0643
remove shoutbox test hacks
2021-03-03 16:47:59 +02:00
0673511fc2
fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
2021-03-03 16:46:53 +02:00
f6af4c43f6
add quick filters for notifications2
2021-03-01 16:21:35 +02:00
740a46245a
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-02-28 09:36:20 -06:00
b4782ad159
Merge branch 'feat/sensitive-by-default' into 'develop'
...
close #1054 add sensitive by default option
Closes #1054
See merge request pleroma/pleroma-fe!1354
2021-02-27 18:31:13 +00:00
cd2f5ced31
add basic validation for statusless status notifications
2021-02-26 14:27:25 +02:00
255db1f7b5
more better attachment limit
2021-02-25 16:05:56 -06:00
4df1078a73
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-02-25 16:03:05 -06:00
ecb211606c
change config comment to be consistent
2021-02-23 10:06:45 +02:00
3f23aecd10
add sensitive by default option
2021-02-23 10:00:23 +02:00
47770ed715
get rid of older messages when scrolling down in chat to keep it from bloating dom
2021-02-17 10:16:58 +02:00
59b7980e7c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-02-05 07:53:23 -06:00
66f3e72b54
update branch with recent develop changes (FA, added settings)
2021-02-01 20:08:36 +02:00
Your New SJW Waifu
HJ
Henry Jameson
eris
Shpuld Shpludson
Mark Felder
Mark Felder