lain [Sat, 1 Dec 2018 08:55:46 +0000 (09:55 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
lain [Sat, 1 Dec 2018 08:03:16 +0000 (09:03 +0100)]
Fix admin api.
kaniini [Sat, 1 Dec 2018 03:09:20 +0000 (03:09 +0000)]
Merge branch 'feature/anonymize-filenames' into 'develop'
Upload filter: anonymize filename
See merge request pleroma/pleroma!486
href [Fri, 30 Nov 2018 18:33:34 +0000 (19:33 +0100)]
Upload filter: anonymize filename
It replaces the original filename with a randomly generated string.
kaniini [Fri, 30 Nov 2018 18:15:44 +0000 (18:15 +0000)]
Merge branch 'feature/reverse-proxy' into 'develop'
reverse proxy / uploads
See merge request pleroma/pleroma!470
href [Fri, 30 Nov 2018 18:12:03 +0000 (19:12 +0100)]
Reverse proxy: default max read duration at 30 secs.
lambda [Fri, 30 Nov 2018 17:57:06 +0000 (17:57 +0000)]
Merge branch 'config-delete' into 'develop'
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
lambda [Fri, 30 Nov 2018 17:56:05 +0000 (17:56 +0000)]
Merge branch 'supervisor-order' into 'develop'
Fix supervisor order
See merge request pleroma/pleroma!485
href [Mon, 19 Nov 2018 19:58:12 +0000 (20:58 +0100)]
Fix supervisor order
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
href [Fri, 30 Nov 2018 17:19:22 +0000 (18:19 +0100)]
Pleroma.Config.delete/1
href [Fri, 30 Nov 2018 16:56:28 +0000 (17:56 +0100)]
MIME: video/audio ogg detection
href [Fri, 30 Nov 2018 16:44:42 +0000 (17:44 +0100)]
Config docs
href [Fri, 30 Nov 2018 16:44:12 +0000 (17:44 +0100)]
Upload: bring back base_url
href [Fri, 30 Nov 2018 10:35:10 +0000 (11:35 +0100)]
Fix deprecation warnings
href [Thu, 29 Nov 2018 20:37:32 +0000 (21:37 +0100)]
remove eal
i like you eal don't take it personally<3
href [Thu, 29 Nov 2018 20:11:45 +0000 (21:11 +0100)]
Uploads fun, part. 2
href [Fri, 23 Nov 2018 22:59:24 +0000 (23:59 +0100)]
reverse_proxy: more headers
href [Fri, 23 Nov 2018 17:57:27 +0000 (18:57 +0100)]
Parse correctly content-type & do not forward content-length
href [Fri, 23 Nov 2018 16:40:45 +0000 (17:40 +0100)]
reverse proxy / uploads
lain [Fri, 30 Nov 2018 16:34:20 +0000 (17:34 +0100)]
Merge remote-tracking branch 'origin' into validate-user-info
lain [Fri, 30 Nov 2018 16:31:05 +0000 (17:31 +0100)]
Fix transmogrifier test.
lain [Fri, 30 Nov 2018 16:21:58 +0000 (17:21 +0100)]
Fix OStatus user updates.
Breaks banner updating.
lain [Fri, 30 Nov 2018 16:08:02 +0000 (17:08 +0100)]
Assorted fixes.
lain [Fri, 30 Nov 2018 16:07:37 +0000 (17:07 +0100)]
Fix TwitterApiController.
lain [Fri, 30 Nov 2018 15:47:37 +0000 (16:47 +0100)]
Remove "most recent notification" endpoint.
kaniini [Fri, 30 Nov 2018 04:36:20 +0000 (04:36 +0000)]
Merge branch 'bugfix/server-true-in-prod' into 'develop'
config/prod.exs: Remove server: true
See merge request pleroma/pleroma!483
Haelwenn (lanodan) Monnier [Fri, 30 Nov 2018 02:05:34 +0000 (03:05 +0100)]
config/prod.exs: Remove server: true
This breaks mix tasks in regular Elixir
lambda [Thu, 29 Nov 2018 09:34:46 +0000 (09:34 +0000)]
Merge branch 'enable-ci-cache' into 'develop'
[CI] Enable CI caching for _build and deps
See merge request pleroma/pleroma!482
rinpatch [Thu, 29 Nov 2018 09:20:47 +0000 (12:20 +0300)]
Only jobs for one branch are allowed to use the same cache
rinpatch [Thu, 29 Nov 2018 09:09:32 +0000 (12:09 +0300)]
Cache _build
rinpatch [Thu, 29 Nov 2018 08:45:14 +0000 (11:45 +0300)]
Add dependency caching
lain [Wed, 28 Nov 2018 23:25:43 +0000 (00:25 +0100)]
More fixes
lambda [Wed, 28 Nov 2018 21:10:20 +0000 (21:10 +0000)]
Merge branch 'fix-list-stream-privacy' into 'develop'
Streamer: Don't send unwanted DMs to list streams
See merge request pleroma/pleroma!478
kaniini [Tue, 27 Nov 2018 23:20:12 +0000 (23:20 +0000)]
Merge branch 'revert-
02e43d44' into 'develop'
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
See merge request pleroma/pleroma!481
kaniini [Tue, 27 Nov 2018 23:19:30 +0000 (23:19 +0000)]
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
This reverts merge request !480
kaniini [Tue, 27 Nov 2018 22:59:01 +0000 (22:59 +0000)]
Merge branch 'chore/mix-lock-update' into 'develop'
Add ex_doc & makeup_elixir to mix.lock
See merge request pleroma/pleroma!480
Maxim Filippov [Tue, 27 Nov 2018 22:12:06 +0000 (01:12 +0300)]
Add ex_doc & makeup_elixir to mix.lock
KokaKiwi [Tue, 27 Nov 2018 00:14:43 +0000 (01:14 +0100)]
Streamer: Don't send unwanted DMs to list streams
lain [Tue, 27 Nov 2018 17:37:46 +0000 (18:37 +0100)]
Fix ostatus test.
lain [Tue, 27 Nov 2018 17:31:44 +0000 (18:31 +0100)]
Webfinger fixes.
lain [Tue, 27 Nov 2018 17:21:05 +0000 (18:21 +0100)]
More and more fixes.
lain [Tue, 27 Nov 2018 17:12:03 +0000 (18:12 +0100)]
More fixes.
kaniini [Tue, 27 Nov 2018 17:10:08 +0000 (17:10 +0000)]
Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'
fix: version string: force git abbrev size to 8 chars
Closes #389
See merge request pleroma/pleroma!472
kaniini [Tue, 27 Nov 2018 16:55:56 +0000 (16:55 +0000)]
Merge branch 'ogg-theora-detection' into 'develop'
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
lain [Tue, 27 Nov 2018 16:42:45 +0000 (17:42 +0100)]
HTTP sig fixes.
lain [Tue, 27 Nov 2018 16:31:14 +0000 (17:31 +0100)]
Fix CommonApi tests.
rinpatch [Tue, 27 Nov 2018 16:07:58 +0000 (19:07 +0300)]
Fix lint error
rinpatch [Tue, 27 Nov 2018 11:34:29 +0000 (14:34 +0300)]
Add Theora detection to upload.ex
Haelwenn [Tue, 27 Nov 2018 00:12:03 +0000 (00:12 +0000)]
Merge branch 'feature/mrf-user-allowlist' into 'develop'
MRF: user allowlist module
See merge request pleroma/pleroma!477
kaniini [Mon, 26 Nov 2018 23:59:30 +0000 (23:59 +0000)]
Merge branch 'fix/pleromafe-title' into 'develop'
Replace hardcoded <title>
See merge request pleroma/pleroma!476
William Pitcock [Mon, 26 Nov 2018 23:54:46 +0000 (23:54 +0000)]
config: document mrf_user_allowlist
William Pitcock [Mon, 26 Nov 2018 23:42:24 +0000 (23:42 +0000)]
nodeinfo: add mrf_user_allowlist data
William Pitcock [Mon, 26 Nov 2018 23:23:43 +0000 (23:23 +0000)]
MRF: add user allowlist module
Mark Felder [Mon, 26 Nov 2018 22:51:25 +0000 (22:51 +0000)]
Replace this hardcoded <title>
kaniini [Mon, 26 Nov 2018 22:24:21 +0000 (22:24 +0000)]
Merge branch 'bugfix/csp-no-https' into 'develop'
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
See merge request pleroma/pleroma!475
Haelwenn (lanodan) Monnier [Mon, 26 Nov 2018 20:40:29 +0000 (21:40 +0100)]
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
This fixes running mastofe with MIX_ENV=dev
Haelwenn [Mon, 26 Nov 2018 19:56:49 +0000 (19:56 +0000)]
Merge branch 'add-manifest-src-to-csp' into 'develop'
Add manifest-src to CSP to allow manifest.json
See merge request pleroma/pleroma!474
shibayashi [Mon, 26 Nov 2018 19:48:24 +0000 (20:48 +0100)]
Add manifest-src to allow manifest.json
kaniini [Sun, 25 Nov 2018 02:54:54 +0000 (02:54 +0000)]
Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
See merge request pleroma/pleroma!471
href [Sat, 24 Nov 2018 13:38:34 +0000 (14:38 +0100)]
version string: force git abbrev size to 8 chars
Fixes #389
Older git versions defaults to 7 chars.
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 07:47:35 +0000 (08:47 +0100)]
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 07:45:45 +0000 (08:45 +0100)]
Web.Streamer: Get unauthenticated statuses representation
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 05:43:03 +0000 (06:43 +0100)]
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 05:13:36 +0000 (06:13 +0100)]
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
reported by soka on CRTNet
kaniini [Thu, 22 Nov 2018 00:28:04 +0000 (00:28 +0000)]
Merge branch 'feature/admin-api' into 'develop'
Add a admin API
See merge request pleroma/pleroma!366
kaniini [Wed, 21 Nov 2018 16:53:38 +0000 (16:53 +0000)]
Merge branch 'feature/improve-version' into 'develop'
Improved version string
See merge request pleroma/pleroma!467
kaniini [Tue, 20 Nov 2018 22:25:35 +0000 (22:25 +0000)]
Merge branch 'runtime-fixes' into 'develop'
Various runtime configuration fixes
See merge request pleroma/pleroma!468
lain [Tue, 20 Nov 2018 19:16:16 +0000 (20:16 +0100)]
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
lain [Tue, 20 Nov 2018 19:14:38 +0000 (20:14 +0100)]
Raise on usage of old function.
lain [Tue, 20 Nov 2018 19:12:39 +0000 (20:12 +0100)]
Fix most mastodon api bugs.
William Pitcock [Tue, 20 Nov 2018 19:08:41 +0000 (19:08 +0000)]
tests: fix up some more broken mastodon api testcases
Haelwenn [Tue, 20 Nov 2018 19:04:52 +0000 (19:04 +0000)]
Merge branch 'feature/retry-queue' into 'develop'
Federator: add retry queue.
See merge request pleroma/pleroma!323
William Pitcock [Tue, 20 Nov 2018 19:02:23 +0000 (19:02 +0000)]
mastodon api: fix up quite a few test failures
William Pitcock [Tue, 20 Nov 2018 18:58:08 +0000 (18:58 +0000)]
activitypub: fix restrict_blocked()
William Pitcock [Tue, 20 Nov 2018 18:54:48 +0000 (18:54 +0000)]
mastodon api: account view: fix tests
William Pitcock [Tue, 20 Nov 2018 18:47:12 +0000 (18:47 +0000)]
streamer: fix fetching the user's block list
William Pitcock [Tue, 20 Nov 2018 18:47:00 +0000 (18:47 +0000)]
oauth plug: fix deactivated check
William Pitcock [Tue, 20 Nov 2018 18:42:28 +0000 (18:42 +0000)]
common api: fix moderator check when deleting posts
William Pitcock [Tue, 20 Nov 2018 18:41:44 +0000 (18:41 +0000)]
user: fix user.info lookup in User.locked?()
lain [Tue, 20 Nov 2018 18:15:28 +0000 (19:15 +0100)]
Fix Notification tests.
kaniini [Tue, 20 Nov 2018 18:09:46 +0000 (18:09 +0000)]
Merge branch 'fix/mediaproxy-empty-url' into 'develop'
mediaproxy: fix empty url & add some tests
See merge request pleroma/pleroma!466
lain [Tue, 20 Nov 2018 18:07:01 +0000 (19:07 +0100)]
Fix formatter tests.
href [Tue, 20 Nov 2018 16:55:03 +0000 (17:55 +0100)]
Improved version string
href [Tue, 20 Nov 2018 16:46:54 +0000 (17:46 +0100)]
mediaproxy: fix empty url & add some tests
eal [Mon, 19 Nov 2018 16:08:41 +0000 (18:08 +0200)]
RetryQueue: tiny refractor, add tests
href [Fri, 16 Nov 2018 20:35:08 +0000 (21:35 +0100)]
Various runtime configuration fixes
lain [Sun, 18 Nov 2018 21:36:47 +0000 (22:36 +0100)]
Several twitter api fixes.
lain [Sun, 18 Nov 2018 21:15:03 +0000 (22:15 +0100)]
Fix user updating from AP.
lain [Sun, 18 Nov 2018 20:41:35 +0000 (21:41 +0100)]
Mix format.
lain [Sun, 18 Nov 2018 20:40:52 +0000 (21:40 +0100)]
Fix most User tests.
lain [Sun, 18 Nov 2018 18:33:43 +0000 (19:33 +0100)]
Fix setting of keys.
lain [Sun, 18 Nov 2018 17:53:50 +0000 (18:53 +0100)]
Fix following locked users.
lain [Sun, 18 Nov 2018 17:52:21 +0000 (18:52 +0100)]
Fix note count update.
lain [Sun, 18 Nov 2018 17:46:04 +0000 (18:46 +0100)]
Fix follower count test.
lain [Sun, 18 Nov 2018 17:40:58 +0000 (18:40 +0100)]
Fix user deactivation test.
lain [Sun, 18 Nov 2018 17:40:31 +0000 (18:40 +0100)]
Fix blocking.
kaniini [Sun, 18 Nov 2018 17:29:25 +0000 (17:29 +0000)]
Merge branch 'update/pleroma-fe-
20181118' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!464
William Pitcock [Sun, 18 Nov 2018 17:27:48 +0000 (17:27 +0000)]
update pleroma frontend
lain [Sun, 18 Nov 2018 17:27:04 +0000 (18:27 +0100)]
Formatting.
lain [Sun, 18 Nov 2018 17:24:16 +0000 (18:24 +0100)]
Fix follower count setting.
projects / akkoma / log