Commit graph

330 commits

Author SHA1 Message Date
89b7557732 Improve account header styles on authorization page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-05 23:42:55 +02:00
e3970f730c Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-23 19:45:55 +01:00
Haelwenn (lanodan) Monnier
2c5bc9cffd Update PleromaFE bundle to 2.5.0 2022-12-23 15:01:49 +01:00
Haelwenn (lanodan) Monnier
cf1d91c718 Update AdminFE bundle to version 2.5.0 2022-12-21 13:03:32 +01:00
2c62043ef9 Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-05 21:08:08 +01:00
Alex Gleason
f303a02e86
Let favicon be configurable 2022-10-27 13:15:15 -05:00
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
f5fe5b4544 Add shortcuts and share_target to manifest.json
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-24 18:34:09 +02:00
3b498061ed Merge remote-tracking branch 'rebased/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-16 21:24:22 +02:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
marcin mikołajczak
0312f6770c Merge branch 'develop' into 'edits'
# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
2022-09-03 14:14:25 +00:00
Haelwenn
e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
Editing

Closes #1429, #2859, and #2288

See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
8d5592ef9d Update @context
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-29 11:45:46 +02:00
64d515df28 Use colors from frontend configuration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-25 14:58:28 +02:00
83946653d6 maybe try using prefers-color-scheme
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-25 12:13:06 +02:00
01950c1223 Update static pages styles
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-25 11:58:54 +02:00
Tusooa Zhu
c59a0bd12f
Add margin to forms and make inputs fill whole width 2022-08-20 21:52:20 -04:00
Alex Gleason
6c87e7f16e Merge branch 'rebased' into 'develop'
Soapbox BE --> Rebased

See merge request soapbox-pub/soapbox-be!163
2022-08-19 13:04:41 +00:00
322e00e45a Revert "Merge branch 'revert-f6e02270' into 'develop'"
This reverts commit 5b8ad6bc91, reversing
changes made to f6e02270c3.
2022-08-18 23:06:18 +02:00
marcin mikołajczak
4de58c2b2c Revert "Merge branch 'polls' into 'develop'"
This reverts merge request !152
2022-08-18 06:38:03 +00:00
Alex Gleason
4de6c67e92
Soapbox BE --> Rebased 2022-08-17 11:25:39 -05:00
fa9106bb1b Merge remote-tracking branch 'soapbox/develop' into polls 2022-08-16 07:42:22 +02:00
Alex Gleason
ce19607358
index.html: add server-generated-meta so tests pass 2022-08-13 14:33:12 -05:00
Alex Gleason
858f83c85a
Restore panel.html and terms-of-service.html so tests pass 2022-08-13 13:35:04 -05:00
Alex Gleason
705ccabec4
Fix landing page image 2022-08-13 13:06:31 -05:00
Alex Gleason
e8cfd1da05
Delete Pleroma FE 2022-08-13 12:50:37 -05:00
9ffb4d055a Handle voters count correctly
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-12 23:49:20 +02:00
538a210f70 Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-09 15:30:34 +02:00
0412cdcb32 Merge remote-tracking branch 'soapbox/develop' into edits
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-08 17:01:48 +02:00
b4575815ed Add entry to @context, tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-08 10:45:43 +02:00
3a6274f29a wip events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-28 11:07:21 +02:00
f073443c79 Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/edits' into edits
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 19:54:14 +02:00
Tusooa Zhu
5e8aac0e07
Record edit history for Note and Question Updates 2022-05-29 13:54:16 -04:00
50d3590137 restyle static pages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-04-30 23:24:25 +02:00
Alex Gleason
4883b996ad
Actually, don't send _misskey_quote anymore 2022-01-28 17:53:19 -06:00
Alex Gleason
b73a53ec69
Handle Fedibird's new quoteUri field 2022-01-28 15:55:52 -06:00
Alex Gleason
ac3426cbca
Transmogrifier: federate quotes with _misskey_quote field 2022-01-28 14:06:32 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-25 11:57:04 -06:00
Alex Gleason
4f51c41f9f
@context: add quoteUrl 2022-01-22 23:29:55 -06:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates 2022-01-22 14:24:50 -06:00
b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 14:57:48 +01:00
Alex Gleason
a4436bcc3f
Merge remote-tracking branch 'origin/stable' into mergeback 2022-01-14 12:37:00 -06:00
rinpatch
a98a127718 Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf 2022-01-11 13:49:06 +03:00
Haelwenn
6b3842cf50 Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625

Closes #2625

See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
Haelwenn (lanodan) Monnier
0910777d41
Update PleromaFE Bundle (2.4.0)
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-08 15:21:21 +02:00
Haelwenn (lanodan) Monnier
5f8a9b671f
Update AdminFE bundle 2021-08-01 08:26:39 +02:00
Sean King
2de41770d0
Remove Twemoji stuff from MastoFE 2021-04-16 18:02:08 -06:00
Sean King
0f8da39b72
Remove priv/static/sounds folder 2021-04-16 15:56:00 -06:00
Sean King
f3b403fa98
Remove MastoFE stuff from docs and default panel 2021-04-15 23:37:18 -06:00
Sean King
4f55d5123b
Remove MastoFE-related backend code and frontend pieces 2021-04-15 22:56:21 -06:00