0d342a35e3
add contentMap to schema
ci/woodpecker/push/woodpecker Pipeline failed
2023-01-15 17:59:19 +00:00
f86bf16430
Add language support on /api/v1/statuses
2023-01-10 10:29:17 +00:00
9a320ba814
make 2fa UI less awful
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline failed
2022-12-16 11:50:25 +00:00
c2054f82ab
allow users with admin:metrics to read app metrics
ci/woodpecker/push/woodpecker Pipeline is pending
2022-12-16 03:32:51 +00:00
9c71782861
Test removed HTTP adapter
ci/woodpecker/push/woodpecker Pipeline is pending
2022-12-11 23:50:31 +00:00
Weblate
021b0864a5
Update translation files
...
ci/woodpecker/push/woodpecker Pipeline is pending
Updated by "Squash Git commits" hook in Weblate.
Translation: Pleroma fe/Akkoma Backend (Static pages)
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
2022-12-09 21:12:53 +00:00
Weblate
c33f0065f2
Translated using Weblate (Indonesian)
...
Currently translated at 21.6% (18 of 83 strings)
Added translation using Weblate (Indonesian)
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: t1 <taaa@fedora.email>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/id/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-12-09 21:12:53 +00:00
sfr
7c4b415929
static-fe overhaul ( #236 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
makes static-fe look more like pleroma-fe, with the stylesheets matching pleroma-dark and pleroma-light based on `prefers-color-scheme`.
- [x] navbar
- [x] about sidebar
- [x] background image
- [x] statuses
- [x] "reply to" or "edited" tags
- [x] accounts
- [x] show more / show less
- [x] posts / with replies / media / followers / following
- [x] followers/following would require user card snippets
- [x] admin/bot indicators
- [x] attachments
- [x] nsfw attachments
- [x] fontawesome icons
- [x] clean up and sort css
- [x] add pleroma-light
- [x] replace hardcoded strings
also i forgot
- [x] repeated headers
how it looks + sneak peek at statuses:
![](https://akkoma.dev/attachments/c0d3a025-6987-4630-8eb9-5f4db6858359 )
Co-authored-by: Sol Fisher Romanoff <sol@solfisher.com>
Reviewed-on: #236
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-12-07 11:20:53 +00:00
8e5a88edf7
update default favicon
ci/woodpecker/push/woodpecker Pipeline was successful
2022-12-05 13:47:52 +00:00
d55de5debf
Remerge of hashtag following ( #341 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
this time with less idiot
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #341
2022-12-05 12:58:48 +00:00
ec6bf8c3f7
revert 4a94c9a31e
...
ci/woodpecker/push/woodpecker Pipeline is pending
revert Add ability to follow hashtags (#336 )
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #336
2022-12-04 20:04:09 +00:00
4a94c9a31e
Add ability to follow hashtags ( #336 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #336
2022-12-04 17:36:59 +00:00
1409f91d50
Add maskable to logo
ci/woodpecker/push/woodpecker Pipeline was successful
2022-12-02 12:00:56 +00:00
db60640c5b
Fixing up deletes a bit ( #327 )
...
ci/woodpecker/push/woodpecker Pipeline failed
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #327
2022-12-01 15:00:53 +00:00
0cfd5b4e89
Add ability to set a default post expiry ( #321 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #321
2022-11-28 13:34:54 +00:00
5bb95256ee
weirdly no, images should not have classes
ci/woodpecker/push/woodpecker Pipeline is pending
2022-11-26 21:15:10 +00:00
a90c45b7e9
Add Signed Fetch Statistics ( #312 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
Close #304 .
Notes:
- This patch was made on top of Pleroma develop, so I created a separate cachex worker for request signature actions, instead of Akkoma's instance cache. If that is a merge blocker, I can attempt to move logic around for that.
- Regarding the `has_request_signatures: true -> false` state transition: I think that is a higher level thing (resetting instance state on new instance actor key) which is separate from the changes relevant to this one.
Co-authored-by: Luna <git@l4.pm>
Reviewed-on: #312
Co-authored-by: @luna@f.l4.pm <akkoma@l4.pm>
Co-committed-by: @luna@f.l4.pm <akkoma@l4.pm>
2022-11-26 19:22:56 +00:00
@r3g_5z@plem.sapphic.site
0e4c201f8d
HTTP header improvements ( #294 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
- Drop Expect-CT
Expect-CT has been redundant since 2018 when Certificate Transparency became mandated and required for all CAs and browsers. This header is only implemented in Chrome and is now deprecated. HTTP header analysers do not check this anymore as this is enforced by default. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT
- Raise HSTS to 2 years and explicitly preload
The longer age for HSTS, the better. Header analysers prefer 2 years over 1 year now as free TLS is very common using Let's Encrypt.
For HSTS to be fully effective, you need to submit your root domain (domain.tld) to https://hstspreload.org . However, a requirement for this is the "preload" directive in Strict-Transport-Security. If you do not have "preload", it will reject your domain.
- Drop X-Download-Options
This is an IE8-era header when Adobe products used to use the IE engine for making outbound web requests to embed webpages in things like Adobe Acrobat (PDFs). Modern apps are using Microsoft Edge WebView2 or Chromium Embedded Framework. No modern browser checks or header analyser check for this.
- Set base-uri to 'none'
This is to specify the domain for relative links (`<base>` HTML tag). pleroma-fe does not use this and it's an incredibly niche tag.
I use all of these myself on my instance by rewriting the headers with zero problems. No breakage observed.
I have not compiled my Elixr changes, but I don't see why they'd break.
Co-authored-by: r3g_5z <june@terezi.dev>
Reviewed-on: #294
Co-authored-by: @r3g_5z@plem.sapphic.site <june@terezi.dev>
Co-committed-by: @r3g_5z@plem.sapphic.site <june@terezi.dev>
2022-11-20 21:20:06 +00:00
Weblate
f2c6749b57
Update translation files
...
ci/woodpecker/push/woodpecker Pipeline is pending
Updated by "Squash Git commits" hook in Weblate.
Translation: Pleroma fe/Akkoma Backend (Errors)
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-errors/
2022-11-10 03:16:35 +00:00
Weblate
f7c1e15d08
Translated using Weblate (Spanish)
...
Currently translated at 21.6% (23 of 106 strings)
Co-authored-by: mint <they@mint.lgbt>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-errors/es/
Translation: Pleroma fe/Akkoma Backend (Errors)
2022-11-10 03:16:35 +00:00
e0032e4799
Add rollbacks for associated_object_id
ci/woodpecker/push/woodpecker Pipeline is pending
2022-11-07 00:08:20 +00:00
b7e8ce2350
Scrape instance nodeinfo ( #251 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #251
2022-11-06 22:49:39 +00:00
7cfce562a9
Add default favicon
...
ci/woodpecker/push/woodpecker Pipeline is pending
Fixes pleroma-fe#185
2022-11-02 22:38:02 +00:00
c6e63aaf6b
Backend settings sync ( #226 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #226
2022-10-06 16:22:15 +00:00
ee2eb7752d
Ensure rollback succeeds
ci/woodpecker/push/woodpecker Pipeline was successful
2022-09-16 13:00:40 +01:00
911f8feb0a
Ensure migrations succeed ( #216 )
...
ci/woodpecker/push/woodpecker Pipeline failed
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #216
2022-09-16 11:53:11 +00:00
Tusooa Zhu
4c06c4ecb1
Add margin to forms and make inputs fill whole width
ci/woodpecker/push/woodpecker Pipeline failed
2022-09-11 20:30:03 +01:00
b6891fe190
Migrations: generate unset user keys
...
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
2022-09-11 19:53:31 +01:00
2641dcdd15
Post editing ( #202 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Rebased from #103
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #202
2022-09-06 19:24:02 +00:00
8e4de118c1
Don't persist local undone follow ( #194 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
same deal but backwards this time
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #194
2022-08-31 18:00:36 +00:00
9cb41b6d7b
add extra instructions to placeholder page
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-30 10:39:36 +01:00
fd7f4874ba
allow new mfm classes
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-24 10:06:48 +01:00
e9f1897cfd
parser MFM server-side ( #172 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #172
2022-08-18 03:14:48 +00:00
Weblate
8bca9a7dbe
Update translation files
...
ci/woodpecker/push/woodpecker Pipeline is pending
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
fcb5e4a48d
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (83 of 83 strings)
Added translation using Weblate (Dutch)
Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/nl/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
b1e2f3f646
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
2f074a6966
Translated using Weblate (Catalan)
...
Currently translated at 2.9% (30 of 1002 strings)
Update translation files
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
fd35a66312
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
5022ecd766
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
62e179f446
make conversation-id deterministic ( #154 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #154
2022-08-06 20:59:15 +00:00
e8806fdc42
allow quote-inline span class
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-08-05 20:35:00 +01:00
0ec3a11895
don't persist undo of follows ( #149 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #149
2022-08-05 13:28:56 +00:00
9df732c42b
Merge branch 'translations' into develop
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-03 22:05:23 +01:00
c9600dbbbf
local-only-fixed ( #138 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #138
2022-08-02 14:46:46 +00:00
Weblate
8b14b65e39
Merge branch 'origin/develop' into Weblate.
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-01 12:48:29 +00:00
55b86e45ec
Merge pull request 'translations' ( #133 ) from translations into develop
...
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #133
2022-08-01 12:48:26 +00:00
Weblate
dbb80c79d5
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (103 of 103 strings)
Translated using Weblate (Catalan)
Currently translated at 0.3% (4 of 1002 strings)
Translated using Weblate (Catalan)
Currently translated at 100.0% (83 of 83 strings)
Translated using Weblate (Catalan)
Currently translated at 13.5% (14 of 103 strings)
Added translation using Weblate (Catalan)
Merge branch 'origin/develop' into Weblate.
Merge branch 'origin/develop' into Weblate.
Merge branch 'origin/develop' into Weblate.
Translated using Weblate (Catalan)
Currently translated at 100.0% (0 of 0 strings)
Added translation using Weblate (Catalan)
Added translation using Weblate (Catalan)
Added translation using Weblate (Catalan)
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-errors/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/ca/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
Translation: Pleroma fe/Akkoma Backend (Errors)
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-01 12:47:27 +00:00
19a27ff006
allow small/center tags in misskeymarkdown ( #132 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #132
2022-08-01 12:46:52 +00:00
Weblate
c0965ed24a
Added translation using Weblate (Catalan)
...
Merge branch 'origin/develop' into Weblate.
Merge branch 'origin/develop' into Weblate.
Merge branch 'origin/develop' into Weblate.
Translated using Weblate (Catalan)
Currently translated at 100.0% (0 of 0 strings)
Added translation using Weblate (Catalan)
Added translation using Weblate (Catalan)
Added translation using Weblate (Catalan)
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
2022-07-29 11:37:51 +00:00
Weblate
f4b507f3a2
Translated using Weblate (Catalan)
...
ci/woodpecker/push/woodpecker Pipeline is pending
Currently translated at 100.0% (0 of 0 strings)
Added translation using Weblate (Catalan)
Added translation using Weblate (Catalan)
Added translation using Weblate (Catalan)
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
2022-07-28 12:12:55 +00:00
2796a9acaf
backend-i18n ( #121 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #121
2022-07-27 21:56:59 +00:00
1419eee5df
Quote posting ( #113 )
...
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
Reviewed-on: #113
2022-07-25 16:30:06 +00:00
54ed8760ff
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' ( #85 )
...
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
Reviewed-on: #85
2022-07-18 13:08:36 +00:00
3cbc401fe0
upgrade oban to v11 ( #84 )
...
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/docs Pipeline was successful
ci/woodpecker/push/release Pipeline was successful
Reviewed-on: #84
2022-07-18 10:48:49 +00:00
17ea24838b
Add avatar image file
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
ci/woodpecker/pr/docs Pipeline is pending
ci/woodpecker/pr/release Pipeline is pending
ci/woodpecker/pr/test Pipeline is pending
2022-07-18 11:25:09 +01:00
d2a185c013
Documentation updates for stable release ( #73 )
...
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
Reviewed-on: #73
2022-07-15 12:27:16 +00:00
b2ce8fcc77
Change pleroma reference in priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
2022-07-12 16:20:53 -04:00
82fa766ed7
Remove precompiled javascript ( #55 )
...
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/release Pipeline was successful
Reviewed-on: #55
2022-07-08 13:03:18 +00:00
Pete
56203aae30
Add index hotspots
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/test Pipeline failed
ci/woodpecker/push/test Pipeline failed
2022-07-01 13:59:26 +01:00
1ecdb19de5
Refactor ES on top of search behaviour
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline failed
2022-06-30 16:28:31 +01:00
Tusooa Zhu
2df25e6666
Support fallbacking to other languages
2022-06-29 20:47:10 +01:00
Tusooa Zhu
7726148472
Send emails i18n'd using backend-stored user language
2022-06-29 20:45:19 +01:00
Tusooa Zhu
c301a95276
Make all emails translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
63a0536d55
Make mail and mailer translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
39cfecb188
Make static fe translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
c6652fccae
Make mfa pages translatable
2022-06-29 20:45:03 +01:00
Tusooa Zhu
8f8d2abb12
Make oauth pages translatable
2022-06-29 20:44:48 +01:00
Tusooa Zhu
ec57e3480c
Make tag feed translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
50913c4dc5
Make password reset pages translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
7107fdc1b9
Extract translatable text
2022-06-29 20:44:16 +01:00
f919035664
update adminfe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/tag/lint Pipeline was successful
ci/woodpecker/tag/test Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
2022-06-14 19:04:22 +01:00
b98bd66a94
Revert "update adminfe"
...
This reverts commit 4532f75da3
.
2022-06-14 19:00:24 +01:00
4532f75da3
update adminfe
2022-06-14 18:51:33 +01:00
6ac2822c73
update fe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/tag/lint Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/tag/test Pipeline was successful
ci/woodpecker/tag/release Pipeline failed
ci/woodpecker/push/test Pipeline failed
2022-06-14 17:29:41 +01:00
1f1c7363df
update pleroma-fe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/tag/lint Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/tag/test Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
2022-06-14 17:10:31 +01:00
c7328c438f
update pleromaFE
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline failed
ci/woodpecker/push/test unknown status
2022-06-14 16:35:32 +01:00
60bfaed368
Allow reacting with emojis containing a number
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
2022-06-14 11:47:09 +02:00
a43859c8f4
update pleroma-fe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline failed
2022-06-12 14:00:52 +01:00
40242e185c
update pleroma-fe
2022-06-11 17:15:57 +01:00
f225db8596
update pleroma-fe
2022-06-08 15:16:32 +01:00
e3214cdfe3
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:48:10 +00:00
d884087e7c
re-add mastofe_settings column
2022-01-08 21:47:52 +00:00
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:45:12 +00:00
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf50
, reversing
changes made to 6b1282a829
.
2022-01-08 21:44:37 +00:00
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00:00
Ivan Tashkinov
a7bdefc208
mix format
2021-12-29 11:44:33 +03:00
Ivan Tashkinov
0c7fb520bf
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up Notification.exclude_blockers/_
).
2021-12-29 11:41:21 +03:00
Alex Gleason
fa35e24a5e
Apps: add user_id index
2021-12-27 18:05:35 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
a85bf5929b
add hashtag indexing
2021-12-14 13:55:14 +00:00
6ca70833f5
add user import
2021-12-14 13:55:14 +00:00
0b5206015b
add mappings
2021-12-14 13:55:14 +00:00
sadposter
6f86baf491
update adminfe
2021-12-06 10:17:54 +00:00
sadposter
c85b278f1e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-12-05 15:01:23 +00:00