Tusooa Zhu
ef277ae4e2
Fix mobile shoutbox
2021-08-03 20:11:06 -04:00
f35e3d0f3f
Fix merge conflict in CHANGELOG
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:47:36 +00:00
179af131ee
Fix changelog merge conflict
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:46:41 +00: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
9cea1bc08c
fix preset
2021-07-01 16:47:16 +01:00
sadposter
d49434a799
add stuff
2021-07-01 16:06:59 +01:00
sadposter
214d85189c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-06-25 10:07:29 +01:00
Henry Jameson
a0eaac2216
fix tests
2021-06-22 21:09:29 +03:00
Henry Jameson
b67db47c88
lint
2021-06-22 20:47:35 +03:00
Henry Jameson
dd3fe61cf3
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix non-notifying mentions and original mention display
fix not escaping some stuff
fix rich images
2021-06-22 20:45:44 +03:00
Henry Jameson
a2f21f4e13
fix description colliding with extra-long text
2021-06-22 20:42:52 +03:00
Henry Jameson
628b99d117
don't stretch columns when uploading media
2021-06-22 20:37:08 +03:00
Henry Jameson
5118eee19a
fix videos not stretching to container
2021-06-22 20:35:34 +03:00
Henry Jameson
4ba8d95a10
fix videos and related not having working drag controls
2021-06-22 20:33:57 +03:00
Henry Jameson
4016182b89
fix z-indexes
2021-06-22 20:32:55 +03:00
Henry Jameson
a258182522
fix non-notifying mentions and original mention display
2021-06-22 20:16:26 +03:00
6125dc885a
Update for latest develop merges to CHANGELOG
2021-06-20 21:06:59 +00: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
cd9dd352e3
Fix follow request count position on mobile
2021-06-20 06:27:32 +00:00
Henry Jameson
c6831a3810
fix not escaping some stuff
2021-06-18 21:42:46 +03:00
Henry Jameson
8fe4355a6b
fix rich images
2021-06-18 21:29:47 +03:00
Henry Jameson
6b8b9c017f
whoops
2021-06-18 17:39:29 +03:00
Henry Jameson
44b741e270
better attachments in uploading (grid layout)
2021-06-18 17:30:56 +03:00
Henry Jameson
8bab8658e8
better handling of unknown files, better upload display
2021-06-18 16:11:16 +03:00
Henry Jameson
bfe31e20ea
better compact attachments
2021-06-18 14:12:50 +03:00
Henry Jameson
5c2744b426
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
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:28:11 +03:00
Henry Jameson
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
Henry Jameson
f35c090caa
merged in compact notifs and improved upon it
2021-06-18 02:27:32 +03:00
Henry Jameson
c1293c3afa
Merge branch 'compact-notifs' into proper-attachments
...
* compact-notifs:
compact notifs
2021-06-18 02:09:50 +03:00
Henry Jameson
f15599e6e5
gallery in post status form!
2021-06-18 02:04:01 +03:00
Henry Jameson
90345f158f
gallery now supports flash, fixes for flash component. refactored media modal
2021-06-18 02:03:38 +03:00
85e2f8f78c
Don't show profile edit button in sidebar
2021-06-17 20:57:23 +00:00
b2ebfc1fd6
Merge branch 'develop' into 'editProfile'
...
# Conflicts:
# CHANGELOG.md
2021-06-17 19:35:09 +00:00
e1361a1cae
Add edit profile button
2021-06-17 19:29:58 +00:00
Henry Jameson
e654fead23
refactored attachments and gallery. All attachments now are in gallery.
2021-06-17 16:29:46 +03:00
9c4957268d
Use proper setting name
2021-06-17 13:21:25 +03:00
6689fed513
Use cleaner instance config check for shoutbox setting
2021-06-17 13:21:25 +03:00
4ecbb58086
Make locale language cleaner
2021-06-17 13:21:25 +03:00
0a3ce9cc8b
Don't shorten shoutbox to SB
2021-06-17 13:21:25 +03:00
dcfd178314
Fix lint error
2021-06-17 13:21:25 +03:00
1b26c713ef
Update CHANGELOG.md
2021-06-17 13:21:25 +03:00
9e9ab5cec9
New option: Hide shoutbox
2021-06-17 13:21:25 +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
1717a3aaf2
fix chats again
2021-06-16 12:44:04 +03:00
Henry Jameson
25bf28f051
added tests just in case
2021-06-16 02:11:24 +03:00
Henry Jameson
ad3a2fd4e5
fixed "invisible" spans inside links
2021-06-16 01:20:20 +03:00
139a0d1562
Merge branch 'develop' into 'themeApply'
...
# Conflicts:
# CHANGELOG.md
2021-06-15 21:50:39 +00:00
