sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6680 commits 3 branches 15 tags 109 MiB
Commit graph

6680 commits

This branch
This branch
All branches
Author SHA1 Message Date
Absturztaube
d3d13d50d4 resolve merge conflicts 2022-07-26 12:22:07 +02:00
Absturztaube
6b10df2d89 merged akkoma-fe develop 2022-07-26 10:44:11 +02:00
floatingghost
a2541bb4e0 Add quotes (#59) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/59
 2022-07-25 16:25:41 +00:00
thomate
04bb4112c0 Added some missing French translations, and fixed an adjacent bit of style that didn’t match the rest (#58) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/58
Co-authored-by: thomate <thomas@burdick.fr>
Co-committed-by: thomate <thomas@burdick.fr>
 2022-07-25 11:36:34 +00:00
floatingghost
c8b2bf96be Merge pull request 'fix time units in poll form' (#56) from poll-times into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/56
 2022-07-23 12:47:08 +00:00
FloatingGhost
4d2cf83452 fix time units 2022-07-23 13:40:52 +01:00
floatingghost
12d7e4ea24 Merge pull request 'don't try to parse pong' (#54) from json-fix into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/54
 2022-07-22 15:09:06 +00:00
FloatingGhost
3d921c81bd don't try to parse pong 2022-07-22 16:08:29 +01:00
floatingghost
e48506844d Merge pull request 'add bubble timeline' (#53) from bubble-keikaku into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/53
 2022-07-22 14:55:47 +00:00
FloatingGhost
18fc3a0ad5 add bubble timeline 2022-07-22 15:36:45 +01:00
floatingghost
75024d8501 re-add time direction (#52) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/52
 2022-07-21 20:56:30 +00:00
floatingghost
7a0b83cdc9 Merge pull request 'scale custom emoji with mfm' (#50) from mfm-emoji-size into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/50
 2022-07-20 15:54:57 +00:00
FloatingGhost
3302ef08ae scale custom emoji with mfm 2022-07-20 16:53:59 +01:00
floatingghost
a8c4aec721 purge shout/chat (#49) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/49
 2022-07-20 15:36:45 +00:00
floatingghost
9a82e8b097 Merge pull request 'fix up some JP localisations' (#48) from i18n/jp-loc into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/48
 2022-07-20 13:36:23 +00:00
FloatingGhost
4714d683d3 fix up some JP localisations 2022-07-20 14:35:45 +01:00
floatingghost
137bf5557c Merge pull request '[#44] i18n/fix-format' (#45) from i18n/fix-format into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/45
 2022-07-19 10:12:36 +00:00
FloatingGhost
606e850aad lint 2022-07-19 11:02:49 +01:00
FloatingGhost
eb47bb8973 remove debug log 2022-07-19 11:02:08 +01:00
FloatingGhost
a32cd0a98c fix time formats 2022-07-19 11:01:24 +01:00
floatingghost
cfb55594a5 Merge pull request 'Make private notes actually work' (#43) from sfr/pleroma-fe:notes into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/43
 2022-07-19 08:33:20 +00:00
Sol Fisher Romanoff
15b612bad6
Make private notes actually work 2022-07-19 08:56:14 +03:00
floatingghost
fab72940c4 announcements (#42) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/42
 2022-07-18 13:08:50 +00:00
floatingghost
2977edc04d theme tab: don't crash out on non-colours (#41) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/41
 2022-07-17 13:13:51 +00:00
Norm
a256931596 Update README with Akkoma stuff (#39) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/39
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
 2022-07-17 13:09:44 +00:00
floatingghost
29f3c8a40e Merge pull request 'Allow ctrl+enter posting when focused on alt text' (#33) from sfr/pleroma-fe:attachment-shortcut into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/33
 2022-07-17 13:09:10 +00:00
floatingghost
e2d064131b Merge pull request 'add mfm cheatsheet link' (#37) from mfm-link into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/37
 2022-07-15 13:01:34 +00:00
FloatingGhost
ea6f6ec82c add mfm cheatsheet link 2022-07-15 14:00:55 +01:00
floatingghost
35146e3615 Merge pull request 'deploy to a branch' (#36) from branch-artifact into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/36
 2022-07-15 10:44:00 +00:00
FloatingGhost
bcd32de461 deploy to a branch 2022-07-15 11:42:56 +01:00
floatingghost
985a70c084 Merge pull request 'Add documentation builder' (#35) from stable-docs into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/35
 2022-07-15 10:21:48 +00:00
FloatingGhost
0dfde3e92c only build on develop and stable 2022-07-15 11:20:01 +01:00
FloatingGhost
361662b6cf build docs on deploy 2022-07-15 11:11:34 +01:00
FloatingGhost
494d7f49c9 add documentation builder 2022-07-15 11:07:43 +01:00
floatingghost
3ff141a122 Merge pull request 'marked-mfm fixes: spin direction, greentext' (#34) from marked-mfm into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/34
 2022-07-15 09:59:22 +00:00
FloatingGhost
dba047ce34 Merge branch 'develop' into marked-mfm 2022-07-15 10:58:41 +01:00
sfr
931ed3d3c7 Use Marked and marked-mfm for MFM rendering (#29) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/29
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-15 09:57:17 +00:00
FloatingGhost
d29bccb7d6 bugfix: spin css, props setting 2022-07-15 10:55:47 +01:00
Sol Fisher Romanoff
d480429896
Allow ctrl+enter posting when focused on alt text 2022-07-14 22:36:14 +03:00
floatingghost
28d5a55352 Merge pull request 'Fix path to terms-of-service.html' (#32) from norm/pleroma-fe:norm-patch-1 into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/32
 2022-07-14 10:28:09 +00:00
Sol Fisher Romanoff
a8f9734400
Don't greentext MFM 2022-07-13 20:59:41 +03:00
norm
4d84fd4cf7 Fix path to terms-of-service.html 2022-07-12 20:46:08 +00:00
Sol Fisher Romanoff
8861835580
Fix CSS 2022-07-12 20:36:49 +03:00
Sol Fisher Romanoff
8c9821e444
Parse MFM options with values 2022-07-12 20:36:48 +03:00
Sol Fisher Romanoff
f15465f0d3
Use media type to figure out whether to parse MFM 2022-07-12 20:36:25 +03:00
Sol Fisher Romanoff
5e18f1ceeb
Move MFM content rendering to RichContent 2022-07-12 20:36:03 +03:00
sfr
5385797ff1 Smarter scope copy (#28) 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/28
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-12 09:04:28 +00:00
floatingghost
7d377b8e88 Merge pull request '[#30] increase spacing of icons' (#31) from icon-spacing into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/31
 2022-07-10 17:11:44 +00:00
FloatingGhost
67bc9e5ba3 increase spacing of icons 2022-07-10 18:05:55 +01:00
Sol Fisher Romanoff
83a3b37f1f
Use Marked and marked-mfm for MFM rendering 2022-07-09 14:34:59 +03:00