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 |
|
|
William Pitcock
|
ece8656733
|
streamer: fix fetching the user's block list
|
2018-11-20 18:47:12 +00:00 |
|
|
William Pitcock
|
3356c7d1e9
|
oauth plug: fix deactivated check
|
2018-11-20 18:47:00 +00:00 |
|
|
William Pitcock
|
4ac849cb4a
|
common api: fix moderator check when deleting posts
|
2018-11-20 18:42:28 +00:00 |
|
|
William Pitcock
|
312676f711
|
user: fix user.info lookup in User.locked?()
|
2018-11-20 18:41:44 +00:00 |
|
|
lain
|
6f0b9a5163
|
Fix Notification tests.
|
2018-11-20 19:15:28 +01:00 |
|
|
kaniini
|
dbb483659a
|
Merge branch 'fix/mediaproxy-empty-url' into 'develop'
mediaproxy: fix empty url & add some tests
See merge request pleroma/pleroma!466
|
2018-11-20 18:09:46 +00:00 |
|
|
lain
|
2887f4ff1d
|
Fix formatter tests.
|
2018-11-20 19:07:01 +01:00 |
|
|
href
|
bc5cf2c192
|
Improved version string
|
2018-11-20 17:55:03 +01:00 |
|
|
href
|
7f4c3a1e99
|
mediaproxy: fix empty url & add some tests
|
2018-11-20 17:50:03 +01:00 |
|
|
eal
|
689b46efc8
|
RetryQueue: tiny refractor, add tests
|
2018-11-19 18:08:41 +02:00 |
|
|
href
|
bcecdc3ab1
|
Various runtime configuration fixes
|
2018-11-19 10:09:24 +01:00 |
|
|
lain
|
fbb70d25fe
|
Several twitter api fixes.
|
2018-11-18 22:36:47 +01:00 |
|
|
lain
|
40d9d2098c
|
Fix user updating from AP.
|
2018-11-18 22:15:03 +01:00 |
|
|
lain
|
cafa15131a
|
Mix format.
|
2018-11-18 21:41:35 +01:00 |
|
|
lain
|
4c918392c6
|
Fix most User tests.
|
2018-11-18 21:40:52 +01:00 |
|
|
lain
|
e7cd6e9739
|
Fix setting of keys.
|
2018-11-18 19:33:43 +01:00 |
|
|
lain
|
fc3bcf335e
|
Fix following locked users.
|
2018-11-18 18:53:50 +01:00 |
|
|
lain
|
d5af41b577
|
Fix note count update.
|
2018-11-18 18:52:21 +01:00 |
|
|
lain
|
6f90ceb2ed
|
Fix follower count test.
|
2018-11-18 18:49:17 +01:00 |
|
|
lain
|
8e3d8bde04
|
Fix user deactivation test.
|
2018-11-18 18:40:58 +01:00 |
|
|
lain
|
812f5b058a
|
Fix blocking.
|
2018-11-18 18:40:31 +01:00 |
|
|
kaniini
|
fbc3f2893a
|
Merge branch 'update/pleroma-fe-20181118' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!464
|
2018-11-18 17:29:25 +00:00 |
|
|
William Pitcock
|
db8f269cd3
|
update pleroma frontend
|
2018-11-18 17:27:48 +00:00 |
|