Commit Graph

8223 Commits (2e310b3ec8e4d8e1b091d042fc048b6f865b89f5)

Author SHA1 Message Date
Sean King 2e310b3ec8
Fix more build errors
3 years ago
Sean King 839c2c6a12
Fix code mistake in OAuth controller
3 years ago
Sean King dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Haelwenn 0c56f9de0d Merge branch 'tests/openapi-everywhere' into 'develop'
3 years ago
feld a07310888f Merge branch 'fix/missing-deprecation' into 'develop'
3 years ago
Mark Felder f58928cf1c Add missing deprecation warning left out of !2842
3 years ago
Haelwenn (lanodan) Monnier 11844084d0
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
3 years ago
Haelwenn (lanodan) Monnier ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
3 years ago
Haelwenn (lanodan) Monnier 168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
3 years ago
Haelwenn a5dce42c85 Merge branch 'chore/rename-chat' into 'develop'
3 years ago
Alex Gleason 028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email
3 years ago
Alex Gleason 9879c18548
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
3 years ago
feld 3fe6ada6fc Merge branch 'cycles-streaming' into 'develop'
3 years ago
Mark Felder 0be7eada92 Keep original Shoutbox channel name as chat:public
3 years ago
Alex Gleason f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
3 years ago
Alex Gleason 8a5ceb7e53
Remove deps from Uploader behaviour
3 years ago
Alex Gleason 708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
3 years ago
Alex Gleason a744c47e9a
Remove deps from Streaming/Persisting behaviors
3 years ago
Mark Felder 2743c66693 Add "chat" back as a feature for backwards compat.
3 years ago
Mark Felder 48a0ea2fc3 Wire up join requests to the old "chat:public" channel into the new "shout:public" channel
3 years ago
Mark Felder d6432a65da Move shout configuration from :instance, update docs and changelog
3 years ago
Mark Felder 4a181982c3 More confusingly named legacy chat code renamed to shout
3 years ago
Mark Felder a3cff59659 Ensure we actually start ShoutChannel
3 years ago
Mark Felder ff00b354fa Rename the non-federating Chat feature to Shout
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
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
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
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
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