Commit graph

358 commits

Author SHA1 Message Date
2cdc1985a5 Visual updates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-13 15:39:13 +02:00
f3f01f4093 Change color for avatar border
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-17 13:48:45 +02:00
7a2200faa8 Include Pleroma logo in .svg
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:19:54 +02:00
1d0b26c1cd prefer Pleroma assets
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-03 20:55:22 +02:00
bd079c7002 Merge branch 'bites' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-27 19:46:07 +02:00
5a32365d1d Allow to bite users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-27 17:33:03 +02:00
9a5a9a961d Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-02 14:58:05 +02:00
Lain Soykaf
574bc1fa5f Frontend: Update to 2.7.0 2024-08-01 11:49:36 +04:00
5d1cb904ac Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-24 11:37:28 +02:00
Mark Felder
e0afb2c093 Elixir Logger configuration is now longer permitted through AdminFE and ConfigDB 2024-06-19 16:39:49 +00:00
7a03e49c4d Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 18:10:03 +02:00
4f5c4d79c4 FEP-2c59, add "webfinger" to user actor
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-11 17:50:11 +02:00
8b92459345 Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 22:00:35 +01:00
1b6301fee7 Use 'schema' alias for schema.org
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:12:23 +01:00
0f33698747 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 23:08:40 +01:00
bd33a7ac8f Remove stuff I don't need to stay closer to upstream
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 16:07:29 +01:00
Haelwenn
ab3f03a04a Merge branch 'develop' into 'public-polls'
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
2024-01-21 12:03:29 +00:00
tusooa
948f01f19a
Bundle 2.6.1 frontend 2023-12-14 20:32:49 -05:00
c78495900e Merge remote-tracking branch 'origin/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-17 22:53:06 +01:00
tusooa
ab894d98f4
Bundle 2.6.0 frontend 2023-10-29 12:59:03 -04:00
e5bd1ee801 Add entry to @context, tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-29 00:02:17 +02:00
01168f9dd8 Static pages: Improve authorization token styling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-09-27 13:44:58 +02:00
Alex Gleason
79fca39faf
Actually, don't send _misskey_quote anymore 2023-09-13 19:19:05 -04:00
Alex Gleason
817e308c0d
Handle Fedibird's new quoteUri field 2023-09-13 19:19:05 -04:00
Alex Gleason
3c8319fe9f
Transmogrifier: federate quotes with _misskey_quote field 2023-09-13 19:19:04 -04:00
Alex Gleason
db46abce47
@context: add quoteUrl 2023-09-13 19:19:04 -04:00
95cf3933fa Improve authorization page permissions styles
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-23 00:19:55 +02:00
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
tusooa
5d34fe1868
Bundle frontend 2023-02-20 12:37:44 -05: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