|
|
0ddf492c5d
|
Merge branch 'cycles-base-url' into 'develop'
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
|
2021-06-01 16:15:27 +00:00 |
|
Haelwenn
|
c4b4258374
|
Merge branch 'features/validators-note' into 'develop'
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
|
2021-06-01 01:51:38 +00:00 |
|
Alex Gleason
|
f2134e605b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
|
2021-05-31 16:49:46 -05:00 |
|
Alex Gleason
|
51a9f97e87
|
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
|
2021-05-31 16:48:03 -05:00 |
|
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
|
2021-05-30 12:58:24 -05:00 |
|
|
|
5d40ffe429
|
Merge branch 'cycles-views' into 'develop'
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
|
2021-05-29 21:50:07 +00:00 |
|
|
|
b5f3a5c979
|
Merge branch 'cycles-html' into 'develop'
Recompilation speedup: Break out activity-specific HTML functions into Pleroma.Activity.HTML
See merge request pleroma/pleroma!3426
|
2021-05-29 21:19:25 +00:00 |
|
Alex Gleason
|
0de6716f06
|
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline
|
2021-05-29 13:32:57 -05:00 |
|
Alex Gleason
|
fa543a9361
|
ActivityPub.Pipeline: switch to runtime deps
Speed up recompilation by breaking compile-time cycles
|
2021-05-29 13:25:11 -05:00 |
|
Alex Gleason
|
1a69f59221
|
Merge remote-tracking branch 'pleroma/develop' into cycles-html
|
2021-05-29 12:29:58 -05:00 |
|
Alex Gleason
|
3ff9c5e2a6
|
Break out activity-specific HTML functions into Pleroma.Activity.HTML
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
|
2021-05-29 12:29:11 -05:00 |
|
Alex Gleason
|
7c96c82b5b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-views
|
2021-05-29 12:17:24 -05:00 |
|
Alex Gleason
|
c9e4200ed2
|
Create real Views for all Controllers
This makes views depend on each other at runtime instead of compile-time
|
2021-05-29 12:15:57 -05:00 |
|
|
|
8871ca5aa3
|
Merge branch 'cycles-router-api-routes' into 'develop'
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
|
2021-05-28 19:06:49 +00:00 |
|
|
|
359ded086c
|
Merge branch 'simplepolicy-announce-leak' into 'develop'
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
|
2021-05-28 19:05:13 +00:00 |
|
|
|
edcdd15e01
|
Merge branch 'alias-router-helpers' into 'develop'
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
|
2021-05-28 19:01:47 +00:00 |
|
Alex Gleason
|
39127f15eb
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
|
2021-05-28 13:51:21 -05:00 |
|
Alex Gleason
|
c23b81e399
|
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Reduce recompilation time by breaking compile-time cycles
|
2021-05-28 13:51:01 -05:00 |
|
|
|
7ad87571bd
|
Merge branch 'cycles-router' into 'develop'
Recompilation speedup: move StaticFEPlug to a pipeline
See merge request pleroma/pleroma!3417
|
2021-05-28 18:24:33 +00:00 |
|
|
|
9f386df83c
|
Merge branch 'cycles-router-mediaproxy' into 'develop'
Recompilation speedup: don't make MediaProxy be a compile-dep of Router
See merge request pleroma/pleroma!3418
|
2021-05-28 18:22:27 +00:00 |
|
Alex Gleason
|
bf2ee12fdb
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
|
2021-05-28 13:08:23 -05:00 |
|
Alex Gleason
|
fda34591ce
|
Don't make MediaProxy be a compile-dep of Router
Speeds up recompilation by removing MediaProxy as a compile-time dep of Router
|
2021-05-28 13:07:34 -05:00 |
|
Alex Gleason
|
e885b49e35
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router
|
2021-05-28 12:44:16 -05:00 |
|
Alex Gleason
|
21787546c0
|
Router: move StaticFEPlug to a pipeline
Speed up recompilation by breaking a cycle. Removes StaticFEPlug as a compile-time dep of Router.
|
2021-05-28 12:43:02 -05:00 |
|
|
|
4694853766
|
Provide totalItems field for featured collections
|
2021-05-27 12:17:31 -05:00 |
|
|
|
05d678c070
|
Expose user email address to user/owner; not publicly.
|
2021-05-20 12:50:43 -05:00 |
|
Alex Gleason
|
ad7d4ff8bc
|
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
|
2021-05-19 12:49:00 -05:00 |
|
Alex Gleason
|
07fed0fda2
|
Switch to aliasing Router.Helpers instead of importing
|
2021-05-18 17:45:30 -05:00 |
|
Alex Gleason
|
bcf6efce15
|
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
|
2021-05-14 09:09:32 -05:00 |
|
Alex Gleason
|
543e9402d6
|
Support blurhash
|
2021-05-14 09:07:16 -05:00 |
|
Alex Gleason
|
ff02511057
|
Merge remote-tracking branch 'upstream/develop' into attachment-meta
|
2021-05-12 20:10:52 -05:00 |
|
Alex Gleason
|
6f0b42656d
|
Federate attachments as Links instead of Documents
|
2021-05-12 19:25:37 -05:00 |
|
Alex Gleason
|
02b9436494
|
Don't render media meta if nil
|
2021-05-12 16:16:10 -05:00 |
|
Alex Gleason
|
4c060ae733
|
Ingest remote attachment width/height
|
2021-05-12 15:38:49 -05:00 |
|
Alex Gleason
|
ab9eabdf20
|
Add SetMeta filter to store uploaded image sizes
|
2021-05-12 15:07:31 -05:00 |
|
Alex Gleason
|
cea44b6b3e
|
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
|
2021-05-07 12:40:45 -05:00 |
|
Alex Gleason
|
926a233cc4
|
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
|
2021-04-30 14:21:17 -05:00 |
|
Alex Gleason
|
c16c7fdb87
|
SimplePolicy: filter string Objects
|
2021-04-30 14:20:54 -05:00 |
|
Alex Gleason
|
3d742c3c1a
|
SimplePolicy: filter nested objects
|
2021-04-30 14:20:37 -05:00 |
|
Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
2021-04-30 13:17:03 -05:00 |
|
Alex Gleason
|
6727a3659f
|
Remove Pleroma.Formatter.minify/2
|
2021-04-30 12:27:06 -05:00 |
|
Alex Gleason
|
e7ac15905e
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
2021-04-29 12:19:10 -05:00 |
|
|
|
9f711ddcf8
|
Try to set query timeout intelligently
|
2021-04-22 10:15:50 -05:00 |
|
|
|
0effcd2cfe
|
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
|
2021-04-22 10:15:50 -05:00 |
|
Sean King
|
d1eb1913e8
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
|
2021-04-19 15:42:38 -06:00 |
|
|
|
efed94a23e
|
Fix error response which was breaking tests related to pinned posts
|
2021-04-19 16:23:57 -05:00 |
|
Sean King
|
2b4f958b2a
|
Add opting out of Google FLoC to HTTPSecurityPlug headers
|
2021-04-18 14:00:18 -06:00 |
|
rinpatch
|
15f87cf658
|
Merge branch 'features/ingestion-ecto-tag' into 'develop'
TagValidator: New
See merge request pleroma/pleroma!3244
|
2021-04-16 09:55:55 +00:00 |
|
rinpatch
|
79376b4afb
|
Merge branch 'feature/521-pinned-post-federation' into 'develop'
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
|
2021-04-16 09:53:47 +00:00 |
|
|
|
0feafcc20c
|
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
|
2021-04-09 10:30:27 -05:00 |
|
