lambda
|
c86d14a84d
|
Merge branch 'enable-ci-cache' into 'develop'
[CI] Enable CI caching for _build and deps
See merge request pleroma/pleroma!482
|
6 years ago |
|
rinpatch
|
72f038bdf2
|
Only jobs for one branch are allowed to use the same cache
|
6 years ago |
|
rinpatch
|
36826b11a6
|
Cache _build
|
6 years ago |
|
rinpatch
|
2a58f5dcaa
|
Add dependency caching
|
6 years ago |
|
lain
|
6ac5d48575
|
More fixes
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
7049ed5936
|
Merge branch 'revert-02e43d44' into 'develop'
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
See merge request pleroma/pleroma!481
|
6 years ago |
|
kaniini
|
4a019827b2
|
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
This reverts merge request !480
|
6 years ago |
|
kaniini
|
02e43d44d3
|
Merge branch 'chore/mix-lock-update' into 'develop'
Add ex_doc & makeup_elixir to mix.lock
See merge request pleroma/pleroma!480
|
6 years ago |
|
Maxim Filippov
|
0314f04c2a
|
Add ex_doc & makeup_elixir to mix.lock
|
6 years ago |
|
KokaKiwi
|
87098d1676
|
Streamer: Don't send unwanted DMs to list streams
|
6 years ago |
|
lain
|
e002858071
|
Fix ostatus test.
|
6 years ago |
|
lain
|
3c61df6b9e
|
Webfinger fixes.
|
6 years ago |
|
lain
|
5bd3b3a215
|
More and more fixes.
|
6 years ago |
|
lain
|
badbe2656c
|
More fixes.
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
b9bc83097d
|
Merge branch 'ogg-theora-detection' into 'develop'
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
|
6 years ago |
|
lain
|
ec464ef20a
|
HTTP sig fixes.
|
6 years ago |
|
lain
|
f983c1d0c6
|
Fix CommonApi tests.
|
6 years ago |
|
rinpatch
|
0d229613df
|
Fix lint error
|
6 years ago |
|
rinpatch
|
7f20a3cf1f
|
Add Theora detection to upload.ex
|
6 years ago |
|
Haelwenn
|
5ae6088d37
|
Merge branch 'feature/mrf-user-allowlist' into 'develop'
MRF: user allowlist module
See merge request pleroma/pleroma!477
|
6 years ago |
|
kaniini
|
a76058fc1d
|
Merge branch 'fix/pleromafe-title' into 'develop'
Replace hardcoded <title>
See merge request pleroma/pleroma!476
|
6 years ago |
|
William Pitcock
|
6979eeda34
|
config: document mrf_user_allowlist
|
6 years ago |
|
William Pitcock
|
271f9f1335
|
nodeinfo: add mrf_user_allowlist data
|
6 years ago |
|
William Pitcock
|
8c05d19c7f
|
MRF: add user allowlist module
|
6 years ago |
|
Mark Felder
|
6cc94404d7
|
Replace this hardcoded <title>
|
6 years ago |
|
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
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
04daa0fa44
|
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
This fixes running mastofe with MIX_ENV=dev
|
6 years ago |
|
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
|
6 years ago |
|
shibayashi
|
591b11eafc
|
Add manifest-src to allow manifest.json
|
6 years ago |
|
kaniini
|
39a3b1724a
|
Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
See merge request pleroma/pleroma!471
|
6 years ago |
|
href
|
f70b20e499
|
version string: force git abbrev size to 8 chars
Fixes #389
Older git versions defaults to 7 chars.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
cc8952b45f
|
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
ca029f0b69
|
Web.Streamer: Get unauthenticated statuses representation
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
d388a99143
|
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
5346fabf14
|
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
reported by soka on CRTNet
|
6 years ago |
|
kaniini
|
675653ceb7
|
Merge branch 'feature/admin-api' into 'develop'
Add a admin API
See merge request pleroma/pleroma!366
|
6 years ago |
|
kaniini
|
182e3e8da2
|
Merge branch 'feature/improve-version' into 'develop'
Improved version string
See merge request pleroma/pleroma!467
|
6 years ago |
|
kaniini
|
a591a044a9
|
Merge branch 'runtime-fixes' into 'develop'
Various runtime configuration fixes
See merge request pleroma/pleroma!468
|
6 years ago |
|
lain
|
0bea0308f1
|
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
|
6 years ago |
|
lain
|
d3180e0ccc
|
Raise on usage of old function.
|
6 years ago |
|
lain
|
0896cf4c0f
|
Fix most mastodon api bugs.
|
6 years ago |
|
William Pitcock
|
5b3480d896
|
tests: fix up some more broken mastodon api testcases
|
6 years ago |
|
Haelwenn
|
c7d08bc1cf
|
Merge branch 'feature/retry-queue' into 'develop'
Federator: add retry queue.
See merge request pleroma/pleroma!323
|
6 years ago |
|
William Pitcock
|
3456948cd1
|
mastodon api: fix up quite a few test failures
|
6 years ago |
|
William Pitcock
|
ef6c64a5d2
|
activitypub: fix restrict_blocked()
|
6 years ago |
|
William Pitcock
|
c196754b4d
|
mastodon api: account view: fix tests
|
6 years ago |
|
William Pitcock
|
ece8656733
|
streamer: fix fetching the user's block list
|
6 years ago |
|
William Pitcock
|
3356c7d1e9
|
oauth plug: fix deactivated check
|
6 years ago |
