Commit graph

13917 commits

Author SHA1 Message Date
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
Alex Gleason
56cd7bc0f2 Merge branch 'asdf-erlang-23.3.4' into 'develop'
asdf: bump erlang to 23.3.4

See merge request soapbox-pub/soapbox!28
2021-05-23 20:41:33 +00:00
Alex Gleason
5fefa86f16
asdf: bump erlang to 23.3.4 2021-05-23 15:29:52 -05: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
Alex Gleason
c023721a04 Merge branch 'release-1.1.1' into 'develop'
Release 1.1.1

See merge request soapbox-pub/soapbox!26
2021-05-21 18:34:06 +00:00
Alex Gleason
586cb9db22
Bump version 1.1.1, update changelog 2021-05-21 13:30:36 -05:00
Alex Gleason
0f3524a59e
Fix broken FE :( 2021-05-21 13:28:44 -05: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
Alex Gleason
d03bad9b32 Merge branch 'prepare-1.1-release' into 'develop'
Prepare 1.1 release

See merge request soapbox-pub/soapbox!25
2021-05-18 17:48:36 +00:00
Alex Gleason
92886c9a34
Update changelog date 2021-05-18 12:36:36 -05:00
Alex Gleason
14b3487878
Update Soapbox FE build 2021-05-18 12:26:55 -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
6e547c4bdd
CHANGELOG_soapbox: update with links, prepare for release 2021-05-17 12:23:04 -05:00
Alex Gleason
6db3c31735
Soapbox: Bump version 1.1.0 2021-05-17 12:17:32 -05:00
Alex Gleason
94f1958a54 Merge branch 'asdf' into 'develop'
Use asdf to avoid Erlang cataclysm

See merge request soapbox-pub/soapbox!22
2021-05-16 21:58:02 +00:00
Alex Gleason
45f68d3f85
Merge remote-tracking branch 'origin/develop' into asdf 2021-05-16 16:46:25 -05:00
Alex Gleason
ba177d2a4b
Simplify mix pleroma.instance gen task 2021-05-16 16:46:21 -05:00
Alex Gleason
952c1f3a9c Merge branch 'gitignore-runtime-exs' into 'develop'
gitignore runtime.exs

See merge request soapbox-pub/soapbox!24
2021-05-16 18:39:54 +00:00
Alex Gleason
2a40aa9866 Merge branch 'optional-config' into 'develop'
Optional prod.secret.exs

See merge request soapbox-pub/soapbox!23
2021-05-16 18:36:20 +00:00
Alex Gleason
96183695bb
Merge remote-tracking branch 'origin/develop' into gitignore-runtime-exs 2021-05-16 13:28:43 -05: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
65d683f8bb
Merge remote-tracking branch 'origin/develop' into optional-config 2021-05-16 12:45:30 -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
28840d2f31
Update pleroma.service for asdf 2021-05-16 11:30:41 -05:00
Alex Gleason
43f1278654
Add .tool-versions for asdf 2021-05-15 11:16:42 -05:00
Alex Gleason
e1bb4a2020 Merge branch 'blurhash' into 'develop'
Blurhash

See merge request soapbox-pub/soapbox!21
2021-05-14 14:32:56 +00:00