Henry Jameson
777f6c0162
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix "+X more" sticking
2021-08-15 18:43:52 +03:00
Henry Jameson
0087d33c75
fix "+X more" sticking
2021-08-15 18:41:13 +03:00
Henry Jameson
299c00cf74
fix video attachments in notifications not having pointer cursor
2021-08-15 18:35:26 +03:00
Henry Jameson
07c12ae162
replace poll with an icon in notifications
2021-08-15 18:26:37 +03:00
Henry Jameson
c8a7b6f433
fix long posts double-fading in notifications
2021-08-15 18:21:25 +03:00
Henry Jameson
5431d8fe55
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix links sticking to mentionsline
2021-08-15 18:11:57 +03:00
Henry Jameson
8cc1ad67df
fix links sticking to mentionsline
2021-08-15 18:11:38 +03:00
Henry Jameson
6aa6f6f300
fix console errors
2021-08-15 17:53:35 +03:00
Henry Jameson
17d2eed06a
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix tests
prevent infinite update loops
remove obsolete tests
removed useless code, review change, fixed bug with tall statuses
fixed mentions line again
remove old emoji added, everything emoji-bearing uses RichContent now
richcontent support in polls, user cards and user profiles
support richcontent in polls
fix tests, add performance test (skipped, doesn't assert anything), tweak max mentions count
made the code responsible for showing unwritten mentions actually work
remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing
fix tests
2021-08-15 16:27:41 +03:00
Henry Jameson
f16658adfc
fix tests
2021-08-15 02:59:14 +03:00
Henry Jameson
68b4323181
prevent infinite update loops
2021-08-15 02:55:45 +03:00
Henry Jameson
7d67e8f1cc
remove obsolete tests
2021-08-15 02:44:36 +03:00
Henry Jameson
530ac4442b
removed useless code, review change, fixed bug with tall statuses
2021-08-15 02:41:53 +03:00
Henry Jameson
4465de5241
fixed mentions line again
2021-08-14 22:03:09 +03:00
Henry Jameson
97e86381c8
remove old emoji added, everything emoji-bearing uses RichContent now
2021-08-13 13:12:33 +03:00
Henry Jameson
4c974f5ca2
richcontent support in polls, user cards and user profiles
2021-08-13 13:06:42 +03:00
Henry Jameson
6c6df29ed3
support richcontent in polls
2021-08-13 12:19:57 +03:00
Henry Jameson
add5921b8b
fix tests, add performance test (skipped, doesn't assert anything),
...
tweak max mentions count
2021-08-12 19:37:04 +03:00
Henry Jameson
2182af4058
made the code responsible for showing unwritten mentions actually work
2021-08-12 03:09:28 +03:00
Henry Jameson
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
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
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
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
