Egor Kislitsyn
|
8b4397c704
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
|
2018-12-06 19:55:58 +07:00 |
|
Egor Kislitsyn
|
04a48286e6
|
Add web push support
|
2018-12-06 19:29:04 +07:00 |
|
KokaKiwi
|
87098d1676
|
Streamer: Don't send unwanted DMs to list streams
|
2018-11-27 20:50:19 +01: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 |
|
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
|
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 |
|
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 |
|
shibayashi
|
591b11eafc
|
Add manifest-src to allow manifest.json
|
2018-11-26 20:48:24 +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 |
|
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 |
|
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 |
|
eal
|
62299be094
|
Federator: add retry queue.
|
2018-11-18 17:46:29 +02:00 |
|
William Pitcock
|
f6be980f4f
|
activitypub: object view: avoid leaking private details
|
2018-11-17 22:30:53 +00:00 |
|
William Pitcock
|
98795172a7
|
ostatus controller: respond with AS2 objects instead of activities to notice URIs
|
2018-11-17 22:10:15 +00:00 |
|
William Pitcock
|
dfcfb184b1
|
activitypub: transmogrifier: make deletes secure
|
2018-11-17 21:22:57 +00:00 |
|
Haelwenn (lanodan) Monnier
|
0ca00b3a07
|
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
|
2018-11-17 22:12:14 +01:00 |
|
Haelwenn (lanodan) Monnier
|
44b6200103
|
lib/mix/tasks/relay*: Use a with block
|
2018-11-17 22:12:13 +01:00 |
|
Haelwenn (lanodan) Monnier
|
12ccf0c4f8
|
Change Relay from status to {status, message}
|
2018-11-17 22:12:13 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4634d99d0d
|
Web.Router: Change right to permission group (except for function names)
|
2018-11-17 22:12:13 +01:00 |
|
William Pitcock
|
0d1375f274
|
federator: return :ok or :error depending on if an AP doc was accepted or not
|
2018-11-17 21:00:37 +00:00 |
|
William Pitcock
|
3d9266a8cb
|
federator: do origin containment when processing inbound messages
|
2018-11-17 20:43:43 +00:00 |
|
William Pitcock
|
c88533209c
|
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
|
2018-11-17 20:16:03 +00:00 |
|
William Pitcock
|
daa8ec3d62
|
activitypub: factor out AP object fetching to it's own function and add ID-based containment
|
2018-11-17 20:15:59 +00:00 |
|
Haelwenn (lanodan) Monnier
|
e0b0fde713
|
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
|
2018-11-17 20:25:57 +01:00 |
|
Haelwenn (lanodan) Monnier
|
1a31d71187
|
lib/mix/tasks/relay_{un,}follow.ex: Use a with block
|
2018-11-17 20:25:57 +01:00 |
|
Haelwenn (lanodan) Monnier
|
ccd6b1956d
|
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
|
2018-11-17 20:25:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
7fbfd2db96
|
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
|
2018-11-17 20:25:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
265c8c5209
|
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
|
2018-11-17 20:25:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4a79b89dba
|
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
|
2018-11-17 20:25:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
f9d05902fe
|
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
|
2018-11-17 20:25:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
a87ed2fad6
|
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
|
2018-11-17 20:25:55 +01:00 |
|
Haelwenn (lanodan) Monnier
|
f48062488e
|
Add get endpoints for rights [AdminAPI]
|
2018-11-17 20:25:55 +01:00 |
|
Haelwenn (lanodan) Monnier
|
59ce7fedce
|
Fix connection returns make generic right endpoint [AdminAPI]
|
2018-11-17 20:25:55 +01:00 |
|
Haelwenn (lanodan) Monnier
|
c5a2bd6a65
|
admin_api_controller.ex: fix remaining params at once
|
2018-11-17 20:25:54 +01:00 |
|
Haelwenn (lanodan) Monnier
|
95b107b6cc
|
admin_api_controller.ex: Add documentation, fix get_invite_token
|
2018-11-17 20:25:54 +01:00 |
|
Haelwenn (lanodan) Monnier
|
578a911737
|
admin_api_controller.ex: get_password_reset: fix params and response
|
2018-11-17 20:25:54 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5732eef16b
|
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
|
2018-11-17 20:25:53 +01:00 |
|