Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,503 Commits 1 Branch 0 Tags 222 MiB
9f391da73d
Commit Graph

13503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
feld
a833a2d76b Merge branch 'plug-runtime-dev' into 'develop' 
Put Plugs in runtime mode in :dev, :test to speed up recompilation

See merge request pleroma/pleroma!3411
 2021-05-28 18:57:45 +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
feld
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
feld
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
Haelwenn
a01093c505 Merge branch 'featured-totalItems' into 'develop' 
Add missing totalItems field for featured collections

See merge request pleroma/pleroma!3416
 2021-05-27 21:01:54 +00:00
Mark Felder
cd4352a86f Missing entry for pinned posts federation from MR !3312 2021-05-27 12:20:21 -05:00
Mark Felder
4694853766 Provide totalItems field for featured collections 2021-05-27 12:17:31 -05:00
Haelwenn
f34e22bba2 Merge branch 'feat/expose_email_to_self' into 'develop' 
Expose user email address to user/owner; not publicly.

See merge request pleroma/pleroma!3412
 2021-05-26 18:04:23 +00:00
Haelwenn
5d0ac015dc Merge branch 'mix_config_deprecation' into 'develop' 
Switch from the deprecated "use Mix.config" to "import Config"

See merge request pleroma/pleroma!3413
 2021-05-22 15:46:02 +00:00
Mark Felder
fe40f6f291 Switch from the deprecated "use Mix.config" to "import Config" 2021-05-20 14:02:58 -05:00
Mark Felder
05d678c070 Expose user email address to user/owner; not publicly. 2021-05-20 12:50:43 -05:00
Alex Gleason
0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev 2021-05-19 14:27:59 -05:00
Alex Gleason
e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation 2021-05-19 14:27:46 -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
feld
8e9f032f25 Merge branch 'chore/changelog' into 'develop' 
Clarify AttachmentMetadata changes

See merge request pleroma/pleroma!3408
 2021-05-18 21:54:54 +00:00
Mark Felder
2d7f6ce6fb Clarify AttachmentMetadata changes 2021-05-18 16:46:51 -05:00
feld
0db436789d Merge branch 'blurhash' into 'develop' 
Upload filter for media metadata (Support blurhash, get WxH)

See merge request pleroma/pleroma!3404
 2021-05-18 21:41:34 +00:00
Mark Felder
c64cbee26c Fixed checking for Upload Filter required commands 2021-05-18 16:28:21 -05:00
Mark Felder
4ab3ef07d0 Check AnalyzeMetadata filter's required commands 
eblurhash:magick uses "convert"
Fetching image metadata uses "mogrify"
 2021-05-18 16:08:31 -05:00
Mark Felder
9b6b5ac196 Rename upload filter to AnalyzeMetadata 2021-05-18 15:33:33 -05:00
lain
44be498fe1 Merge branch 'optional-config' into 'develop' 
Save ~10 minutes on source installation

See merge request pleroma/pleroma!3406
 2021-05-17 18:41:12 +00:00
Alex Gleason
7ac4da8dd4
Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs 2021-05-16 13:22:26 -05:00
Alex Gleason
230ad82dad
gitignore config/runtime.exs 2021-05-16 13:22:07 -05:00
Alex Gleason
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config 2021-05-16 12:27:29 -05:00
Alex Gleason
b540fff908
Docs: use MIX_ENV=prod mix pleroma.instance gen 2021-05-16 12:26:51 -05:00
Alex Gleason
b22f54eb29
Make prod.secret.exs optional (with warning) 2021-05-16 12:26:32 -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
5a57b025c7
Changelog: attachment meta 2021-05-12 20:15:33 -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
feld
745375bdcf Merge branch 'dont-crash-email-settings' into 'develop' 
Don't crash so hard when email settings are invalid

Closes #2606

See merge request pleroma/pleroma!3400
 2021-05-04 13:30:00 +00:00
feld
d5263bfcf3 Merge branch 'earmark' into 'develop' 
Upgrade Earmark to v1.4.15

Closes #1942 and #2026

See merge request pleroma/pleroma!3076
 2021-05-04 13:29:14 +00:00
Alex Gleason
90770e0841
CHANGELOG: don't crash so hard when email settings are invalid 2021-05-03 14:43:34 -05:00
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings 2021-05-03 14:43:28 -05:00
Alex Gleason
c80b1aaf51
Don't crash when email settings are invalid 
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
 2021-05-03 14:43:14 -05:00
Alex Gleason
dca87c5e7b
CHANGELOG: markdown 2021-05-01 11:28:06 -05:00
Alex Gleason
20878c7f99
CHANGELOG: SimplePolicy embedded objects are now checked 2021-04-30 14:22:02 -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