Eris
9e9ab5cec9
New option: Hide shoutbox
2021-06-17 13:21:25 +03:00
Henry Jameson
55682ea93f
Merge branch 'settings-and-filtering' into shigusegubu
...
* settings-and-filtering:
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-16 14:32:23 +03:00
Henry Jameson
a96a62929d
Merge remote-tracking branch 'origin/develop' into settings-and-filtering
...
* 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-16 13:52:13 +03:00
Henry Jameson
6fb9e22561
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
fix chats again
2021-06-16 12:44:20 +03:00
Henry Jameson
1717a3aaf2
fix chats again
2021-06-16 12:44:04 +03:00
Henry Jameson
779c753f99
debug t.map not a function
2021-06-16 12:34:24 +03:00
Henry Jameson
932e9747b2
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
added tests just in case
2021-06-16 02:12:41 +03:00
Henry Jameson
25bf28f051
added tests just in case
2021-06-16 02:11:24 +03:00
Henry Jameson
ddce5e15f2
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
added tests just in case
fixed "invisible" spans inside links
2021-06-16 01:44:50 +03:00
Henry Jameson
1427df3442
added tests just in case
2021-06-16 01:44:29 +03:00
Henry Jameson
ad3a2fd4e5
fixed "invisible" spans inside links
2021-06-16 01:20:20 +03:00
eris
139a0d1562
Merge branch 'develop' into 'themeApply'
...
# Conflicts:
# CHANGELOG.md
2021-06-15 21:50:39 +00:00
eris
cab0095989
Merge branch 'develop' into 'showMobileNewPost'
...
# Conflicts:
# CHANGELOG.md
# src/App.js
2021-06-15 21:49:33 +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
Henry Jameson
3cace0fe09
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
fixed bug with hashtags
2021-06-15 14:50:15 +03:00
Henry Jameson
4aac0125e5
fixed bug with hashtags
2021-06-15 14:43:44 +03: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
e67f295497
Update CHANGELOG.md
2021-06-14 23:32:18 +00:00
Eris
312a237ca4
Revert duplicate buttons and move existing buttons to bottom-right corner independent of scroll
2021-06-14 23:31:16 +00:00
Eris
4639e30cb8
Fix config naming for consistency
2021-06-14 20:41:34 +00:00
Eris
cbccea0546
Don't shorten shoutbox to SB
2021-06-14 20:33:51 +00:00
Eris
b88e6b8ab0
Update CHANGELOG.md
2021-06-14 20:11:57 +00:00
Eris
8fa0331771
Add apply and reset themes to top of theme tab
2021-06-14 20:09:28 +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
Eris
67c9d8bd55
revert gitignore file change
2021-06-14 18:49:37 +00:00
Eris
adfe56a3a3
New option: Always show floating New Post button
2021-06-14 17:54:40 +00:00
Henry Jameson
7ab5a1c8f8
Merge branch 'fix-themes-select' into shigusegubu
...
* fix-themes-select:
Fixed mergedConfig misbehaving on first boot
lint
2021-06-14 10:58:50 +03:00
Henry Jameson
63c22ad131
Fixed mergedConfig misbehaving on first boot
2021-06-14 10:58:32 +03:00
Henry Jameson
d7700ba944
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
lint
do the impossible, fix the unfixable
2021-06-14 10:35:35 +03:00
Henry Jameson
7309f8ce1a
lint
2021-06-14 10:31:07 +03:00
Henry Jameson
c21b1cf898
do the impossible, fix the unfixable
2021-06-14 10:30:08 +03:00
Henry Jameson
a3c703bd37
compact notifs
2021-06-14 02:52:41 +03:00
Henry Jameson
3cb7123897
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
more fixes
fix mentions in chats
fix chats messages
2021-06-13 22:23:20 +03:00
Henry Jameson
636dbdaba8
more fixes
2021-06-13 22:22:59 +03:00
Henry Jameson
1fdfc42159
fix mentions in chats
2021-06-13 21:43:45 +03:00
Henry Jameson
609dc5da0c
fix chats messages
2021-06-13 21:42:25 +03:00
Henry Jameson
1696810b07
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
refactored line converter, untied its logic from greentexting, better handling of broken cases
Apply 1 suggestion(s) to 1 file(s)
2021-06-13 15:24:38 +03:00
Henry Jameson
bebafa1a2c
refactored line converter, untied its logic from greentexting, better
...
handling of broken cases
2021-06-13 15:24:29 +03:00
Henry Jameson
01a249e3c7
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
refactored line converter, untied its logic from greentexting, better handling of broken cases
2021-06-13 13:30:17 +03:00
Henry Jameson
8c2a6af36a
refactored line converter, untied its logic from greentexting, better
...
handling of broken cases
2021-06-13 13:30:05 +03:00
HJ
e825021ef1
Apply 1 suggestion(s) to 1 file(s)
2021-06-12 18:55:18 +00:00
Henry Jameson
b5217e992d
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
fixed a bug + made a testcase out of it
2021-06-12 21:50:29 +03:00
Henry Jameson
9c70f3e4df
fixed a bug + made a testcase out of it
2021-06-12 21:49:56 +03:00
Henry Jameson
cabb595ead
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
fix next relply-row bleeding through popover
2021-06-12 20:52:09 +03:00
Henry Jameson
2c60a9b638
fix next relply-row bleeding through popover
2021-06-12 20:51:36 +03:00
Henry Jameson
fb3f7649df
Merge branch 'better-still-emoji' into shigusegubu
...
* better-still-emoji:
lint
review + fixes
2021-06-12 20:44:58 +03:00
