Commit Graph

13482 Commits (c4b4258374e73ca4a6e3f3b30e3a8dad0ce40039)
 

Author SHA1 Message Date
Haelwenn c4b4258374 Merge branch 'features/validators-note' into 'develop'
3 years ago
Haelwenn a0ba44904a Merge branch 'docs/goto-libera' into 'develop'
3 years ago
Haelwenn (lanodan) Monnier 03232a8223
Changing references of freenode to libera.chat
3 years ago
Haelwenn e53984e446 Merge branch 'weblate-pleroma-pleroma' into 'develop'
3 years ago
Snow 2fde1f2549 Translated using Weblate (Chinese (Traditional))
3 years ago
Snow b3209c31bc Translated using Weblate (Chinese (Traditional))
3 years ago
Snow 0107ec63a2 Added translation using Weblate (Chinese (Traditional))
3 years ago
Haelwenn 4a58cb469b Merge branch 'ffmpeg' into 'develop'
3 years ago
shibao 0204ceff7f Add ffmpeg
3 years ago
feld 5d40ffe429 Merge branch 'cycles-views' into 'develop'
3 years ago
feld b5f3a5c979 Merge branch 'cycles-html' into 'develop'
3 years ago
feld 317fe240a8 Merge branch 'cycles-gun' into 'develop'
3 years ago
feld b2f5f48750 Merge branch 'cycles-config' into 'develop'
3 years ago
feld 018dc12b4c Merge branch 'cycles-pipeline' into 'develop'
3 years ago
Alex Gleason 0de6716f06
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline
3 years ago
Alex Gleason fa543a9361
ActivityPub.Pipeline: switch to runtime deps
3 years ago
Alex Gleason 1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
3 years ago
Alex Gleason 3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
3 years ago
Alex Gleason 7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
3 years ago
Alex Gleason c9e4200ed2
Create real Views for all Controllers
3 years ago
Alex Gleason cc9e456c0a
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs
3 years ago
Alex Gleason 32d263cb90
Config: use runtime deps instead of module attributes
3 years ago
Alex Gleason e2ba852bfe
Merge remote-tracking branch 'pleroma/develop' into cycles-gun
3 years ago
Alex Gleason 0ada3fe823
Gun: use runtime deps in ConnectionPool
3 years ago
Alex Gleason 3ebede4b51
Gun: make Gun.API a runtime dep
3 years ago
feld 8871ca5aa3 Merge branch 'cycles-router-api-routes' into 'develop'
3 years ago
feld 359ded086c Merge branch 'simplepolicy-announce-leak' into 'develop'
3 years ago
feld c44dd05f64 Merge branch 'gitignore-runtime-exs' into 'develop'
3 years ago
feld edcdd15e01 Merge branch 'alias-router-helpers' into 'develop'
3 years ago
feld a833a2d76b Merge branch 'plug-runtime-dev' into 'develop'
3 years ago
Alex Gleason 39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
3 years ago
Alex Gleason c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
3 years ago
feld 7ad87571bd Merge branch 'cycles-router' into 'develop'
3 years ago
feld 9f386df83c Merge branch 'cycles-router-mediaproxy' into 'develop'
3 years ago
Alex Gleason bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
3 years ago
Alex Gleason fda34591ce
Don't make MediaProxy be a compile-dep of Router
3 years ago
Alex Gleason e885b49e35
Merge remote-tracking branch 'pleroma/develop' into cycles-router
3 years ago
Alex Gleason 21787546c0
Router: move StaticFEPlug to a pipeline
3 years ago
Haelwenn a01093c505 Merge branch 'featured-totalItems' into 'develop'
3 years ago
Mark Felder cd4352a86f Missing entry for pinned posts federation from MR !3312
3 years ago
Mark Felder 4694853766 Provide totalItems field for featured collections
3 years ago
Haelwenn f34e22bba2 Merge branch 'feat/expose_email_to_self' into 'develop'
3 years ago
Haelwenn 5d0ac015dc Merge branch 'mix_config_deprecation' into 'develop'
3 years ago
Mark Felder fe40f6f291 Switch from the deprecated "use Mix.config" to "import Config"
3 years ago
Mark Felder 05d678c070 Expose user email address to user/owner; not publicly.
3 years ago
Alex Gleason 0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
3 years ago
Alex Gleason e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation
3 years ago
Alex Gleason ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
3 years ago
Alex Gleason 07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
3 years ago
feld 8e9f032f25 Merge branch 'chore/changelog' into 'develop'
3 years ago