hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6263 commits 4 branches 0 tags 44 MiB
Commit graph

6263 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
e75eef4ae2 Merge branch 'better-still-emoji' into shigusegubu 
* 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
 2021-08-15 02:59:30 +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
3c4c33c8ee fixed mentions line again 2021-08-14 21:55:38 +03:00
Henry Jameson
de30e0bf1a Merge branch 'better-still-emoji' into shigusegubu 
* better-still-emoji:
  remove old emoji added, everything emoji-bearing uses RichContent now
  richcontent support in polls, user cards and user profiles
  support richcontent in polls
 2021-08-13 13:13:46 +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
f96ffe3699 Merge branch 'better-still-emoji' into shigusegubu 
* better-still-emoji:
  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
 2021-08-12 23:01:29 +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
Haelwenn
ff37dbbd23 Merge branch 'develop' into 'simplePolicy_reasons_for_instance_specific_policies' 
# Conflicts:
#   src/i18n/nl.json
 2021-07-23 03:47:39 +00:00
eris
f35e3d0f3f Fix merge conflict in CHANGELOG 
# Conflicts:
#   CHANGELOG.md
 2021-07-22 20:47:36 +00:00
eris
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
b345e06984 Merge branch 'better-still-emoji' into shigusegubu 
* better-still-emoji:
  fix tests
 2021-06-22 21:13:29 +03:00
Henry Jameson
a0eaac2216 fix tests 2021-06-22 21:09:29 +03:00
Henry Jameson
b9ec78e454 Merge branch 'proper-attachments' into shigusegubu 
* proper-attachments:
  lint
  fix description colliding with extra-long text
 2021-06-22 20:47:59 +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
ed9091082a Merge branch 'proper-attachments' into shigusegubu 
* proper-attachments:
  don't stretch columns when uploading media
  fix videos not stretching to container
  fix videos and related not having working drag controls
  fix z-indexes
 2021-06-22 20:37:29 +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
5a94c410f0 Merge branch 'better-still-emoji' into shigusegubu 
* better-still-emoji:
  fix non-notifying mentions and original mention display
 2021-06-22 20:25:48 +03:00
Henry Jameson
a258182522 fix non-notifying mentions and original mention display 2021-06-22 20:16:26 +03:00
eris
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
Eris
cd9dd352e3 Fix follow request count position on mobile 2021-06-20 06:27:32 +00:00
Henry Jameson
a0330483cf Merge branch 'better-still-emoji' into shigusegubu 
* better-still-emoji:
  fix not escaping some stuff
  fix rich images
 2021-06-18 21:43:12 +03: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
5b9f88e8b9 Merge branch 'proper-attachments' into shigusegubu 
* proper-attachments:
  whoops
 2021-06-18 17:39:37 +03:00
Henry Jameson
6b8b9c017f whoops 2021-06-18 17:39:29 +03:00
Henry Jameson
08ce9ba30b Merge branch 'proper-attachments' into shigusegubu 
* proper-attachments:
  better attachments in uploading (grid layout)
  better handling of unknown files, better upload display
  better compact attachments
  merged in compact notifs and improved upon it
  gallery in post status form!
  gallery now supports flash, fixes for flash component. refactored media modal
  refactored attachments and gallery. All attachments now are in gallery.
  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
  compact notifs
 2021-06-18 17:33:54 +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