Commit Graph

13493 Commits (ff00b354fa5067c898e860e275748dd757cb04cd)
 

Author SHA1 Message Date
Mark Felder ff00b354fa Rename the non-federating Chat feature to Shout
3 years ago
feld ee52fc840d Merge branch 'cycles-constants' into 'develop'
3 years ago
Alex Gleason c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
3 years ago
feld 75b94a2f35 Merge branch 'cycles-frontend-static' into 'develop'
3 years ago
feld 0ddf492c5d Merge branch 'cycles-base-url' into 'develop'
3 years ago
Haelwenn c4b4258374 Merge branch 'features/validators-note' into 'develop'
3 years ago
Alex Gleason f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
Alex Gleason 51a9f97e87
Deprecate Pleroma.Web.base_url/0
3 years ago
Alex Gleason 10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
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
Alex Gleason 2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
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
Alex Gleason 595bca24ad
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
3 years ago
Alex Gleason 721c966842
FrontendStatic: make Router a runtime dep
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