moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,317 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

3317 Commits

Author SHA1 Message Date
kaniini 52ce368562 Merge branch 'bugfix/server-true-in-prod' into 'develop' 
config/prod.exs: Remove server: true

See merge request pleroma/pleroma!483
 2018-11-30 04:36:20 +00:00
Haelwenn (lanodan) Monnier 761ed2355f
config/prod.exs: Remove server: true 
This breaks mix tasks in regular Elixir
 2018-11-30 03:05:34 +01:00
lambda c86d14a84d Merge branch 'enable-ci-cache' into 'develop' 
[CI] Enable CI caching for _build and deps

See merge request pleroma/pleroma!482
 2018-11-29 09:34:46 +00:00
rinpatch 72f038bdf2 Only jobs for one branch are allowed to use the same cache 2018-11-29 12:20:47 +03:00
rinpatch 36826b11a6 Cache _build 2018-11-29 12:09:32 +03:00
rinpatch 2a58f5dcaa Add dependency caching 2018-11-29 11:45:14 +03:00
lain 6ac5d48575 More fixes 2018-11-29 00:25:43 +01:00
lambda 73101c1fc1 Merge branch 'fix-list-stream-privacy' into 'develop' 
Streamer: Don't send unwanted DMs to list streams

See merge request pleroma/pleroma!478
 2018-11-28 21:10:20 +00:00
kaniini 7049ed5936 Merge branch 'revert-02e43d44' into 'develop' 
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

See merge request pleroma/pleroma!481
 2018-11-27 23:20:12 +00:00
kaniini 4a019827b2 Revert "Merge branch 'chore/mix-lock-update' into 'develop'" 
This reverts merge request !480
 2018-11-27 23:19:30 +00:00
kaniini 02e43d44d3 Merge branch 'chore/mix-lock-update' into 'develop' 
Add ex_doc & makeup_elixir to mix.lock

See merge request pleroma/pleroma!480
 2018-11-27 22:59:01 +00:00
Maxim Filippov 0314f04c2a Add ex_doc & makeup_elixir to mix.lock 2018-11-28 01:12:11 +03:00
KokaKiwi 87098d1676 Streamer: Don't send unwanted DMs to list streams 2018-11-27 20:50:19 +01:00
lain e002858071 Fix ostatus test. 2018-11-27 18:37:46 +01:00
lain 3c61df6b9e Webfinger fixes. 2018-11-27 18:31:44 +01:00
lain 5bd3b3a215 More and more fixes. 2018-11-27 18:21:05 +01:00
lain badbe2656c More fixes. 2018-11-27 18:12:03 +01:00
kaniini 41ff86ca1d 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
 2018-11-27 17:10:08 +00:00
kaniini b9bc83097d Merge branch 'ogg-theora-detection' into 'develop' 
Add Theora detection to upload.ex

See merge request pleroma/pleroma!479
 2018-11-27 16:55:56 +00:00
lain ec464ef20a HTTP sig fixes. 2018-11-27 17:42:45 +01:00
lain f983c1d0c6 Fix CommonApi tests. 2018-11-27 17:31:14 +01:00
rinpatch 0d229613df Fix lint error 2018-11-27 19:07:58 +03:00
rinpatch 7f20a3cf1f Add Theora detection to upload.ex 2018-11-27 17:51:02 +03:00
Haelwenn 5ae6088d37 Merge branch 'feature/mrf-user-allowlist' into 'develop' 
MRF: user allowlist module

See merge request pleroma/pleroma!477
 2018-11-27 00:12:03 +00:00
kaniini a76058fc1d Merge branch 'fix/pleromafe-title' into 'develop' 
Replace hardcoded <title>

See merge request pleroma/pleroma!476
 2018-11-26 23:59:30 +00:00
William Pitcock 6979eeda34 config: document mrf_user_allowlist 2018-11-26 23:54:46 +00:00
William Pitcock 271f9f1335 nodeinfo: add mrf_user_allowlist data 2018-11-26 23:52:19 +00:00
William Pitcock 8c05d19c7f MRF: add user allowlist module 2018-11-26 23:51:58 +00:00
Mark Felder 6cc94404d7 Replace this hardcoded <title> 2018-11-26 22:51:25 +00:00
kaniini bdb0c6e418 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
 2018-11-26 22:24:21 +00:00
Haelwenn (lanodan) Monnier 04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https 
This fixes running mastofe with MIX_ENV=dev
 2018-11-26 21:41:36 +01:00
Haelwenn 3370924b8b Merge branch 'add-manifest-src-to-csp' into 'develop' 
Add manifest-src to CSP to allow manifest.json

See merge request pleroma/pleroma!474
 2018-11-26 19:56:49 +00:00
shibayashi 591b11eafc
Add manifest-src to allow manifest.json 2018-11-26 20:48:24 +01:00
kaniini 39a3b1724a Merge branch 'bugfix/public-mastoapi-websocket' into 'develop' 
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints

See merge request pleroma/pleroma!471
 2018-11-25 02:54:54 +00:00
href f70b20e499
version string: force git abbrev size to 8 chars 
Fixes #389

Older git versions defaults to 7 chars.
 2018-11-24 14:38:34 +01:00
Haelwenn (lanodan) Monnier cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket 2018-11-24 08:51:35 +01:00
Haelwenn (lanodan) Monnier ca029f0b69
Web.Streamer: Get unauthenticated statuses representation 2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level 2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier 5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints 
reported by soka on CRTNet
 2018-11-24 06:13:36 +01:00
kaniini 675653ceb7 Merge branch 'feature/admin-api' into 'develop' 
Add a admin API

See merge request pleroma/pleroma!366
 2018-11-22 00:28:04 +00:00
kaniini 182e3e8da2 Merge branch 'feature/improve-version' into 'develop' 
Improved version string

See merge request pleroma/pleroma!467
 2018-11-21 16:53:38 +00:00
kaniini a591a044a9 Merge branch 'runtime-fixes' into 'develop' 
Various runtime configuration fixes

See merge request pleroma/pleroma!468
 2018-11-20 22:25:35 +00:00
lain 0bea0308f1 Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-11-20 20:16:16 +01:00
lain d3180e0ccc Raise on usage of old function. 2018-11-20 20:14:38 +01:00
lain 0896cf4c0f Fix most mastodon api bugs. 2018-11-20 20:12:39 +01:00
William Pitcock 5b3480d896 tests: fix up some more broken mastodon api testcases 2018-11-20 19:08:41 +00:00
Haelwenn c7d08bc1cf Merge branch 'feature/retry-queue' into 'develop' 
Federator: add retry queue.

See merge request pleroma/pleroma!323
 2018-11-20 19:04:52 +00:00
William Pitcock 3456948cd1 mastodon api: fix up quite a few test failures 2018-11-20 19:02:23 +00:00
William Pitcock ef6c64a5d2 activitypub: fix restrict_blocked() 2018-11-20 18:58:08 +00:00
William Pitcock c196754b4d mastodon api: account view: fix tests 2018-11-20 18:54:48 +00:00