677df5ceb3
Merge branch 'security/remote-follow-commonapi' into 'develop'
...
twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
See merge request pleroma/pleroma!1506
2019-07-29 20:10:59 +00:00
3850812503
twitter api: utils: rework do_remote_follow() to use CommonAPI
...
Closes #1138
2019-07-29 20:00:57 +00:00
6657506185
Merge branch 'revert-83508418' into 'develop'
...
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
See merge request pleroma/pleroma!1505
2019-07-29 19:42:35 +00:00
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
83508418fb
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
...
markdown: clean up html generated by earmark
See merge request pleroma/pleroma!1504
2019-07-29 19:24:14 +00:00
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
3b8cd27b05
Merge branch 'mailer-enabled-nodeinfo' into 'develop'
...
Add `mailerEnabled` to the NodeInfo metadata
See merge request pleroma/pleroma!1502
2019-07-29 16:17:41 +00:00
0bee2131ce
Add `mailerEnabled` to the NodeInfo metadata
2019-07-29 16:17:40 +00:00
8be0154094
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
...
Redirect not logged-in users to the MastoFE login page on private instances
Closes #1045
See merge request pleroma/pleroma!1503
2019-07-29 16:17:23 +00:00
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
1f7c8d9615
Merge branch 'tests/ostatus_controller' into 'develop'
...
added tests for OstatusController
See merge request pleroma/pleroma!1501
2019-07-29 05:02:20 +00:00
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
9d78b3b281
mix: add ex_const dependency
2019-07-29 02:12:35 +00:00
b38d21060e
Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'
...
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
See merge request pleroma/pleroma!1498
2019-07-28 21:40:55 +00:00
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
44bfff22a7
Merge branch 'confirmation-resend' into 'develop'
...
add account confirmation email resend in mastodon api
See merge request pleroma/pleroma!1492
2019-07-28 20:30:10 +00:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
0d05ec3855
Merge branch 'fix/user_update_and_set_cache' into 'develop'
...
fixed User.update_and_set_cache for stale user
See merge request pleroma/pleroma!1493
2019-07-28 20:29:27 +00:00
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
488c06b6f5
Merge branch 'develop' into 'develop'
...
Fix HTTP sig tweak on KeyId
See merge request pleroma/pleroma!1496
2019-07-28 20:25:35 +00:00
f78390ffdf
Merge branch 'feature/hackney-303-redirect' into 'develop'
...
Handle 303 redirects
Closes #1127
See merge request pleroma/pleroma!1497
2019-07-28 20:24:39 +00:00
02dc651828
Handle 303 redirects
2019-07-28 20:24:39 +00:00
961e778531
Fix HTTP sig tweak on KeyId
2019-07-28 14:17:56 +02:00
08960d5016
Merge branch 'issue/1097' into 'develop'
...
[#1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
See merge request pleroma/pleroma!1495
2019-07-26 20:27:38 +00:00
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
46e8b68093
Merge branch 'changelog/1484-base_url-remove-media' into 'develop'
...
Changelog: !1484 base_url removed /media/
See merge request pleroma/pleroma!1494
2019-07-26 15:27:12 +00:00
7c8abbcb1c
CHANGELOG.md: Add entry for !1484
...
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484
[ci skip]
2019-07-26 17:26:37 +02:00
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
d1e891062e
Merge branch 'tests/filter_dedupe' into 'develop'
...
fixed test for elixir 1.7.4
See merge request pleroma/pleroma!1487
2019-07-25 03:43:13 +00:00
03c386614f
fixed test for elixir 1.7.4
2019-07-25 03:43:13 +00:00
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
931c4974ee
Merge branch 'fix/put-correct-activity-url' into 'develop'
...
Show the url advertised in the Activity in the Status JSON response
Closes #1077
See merge request pleroma/pleroma!1485
2019-07-24 19:28:21 +00:00
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
8d9f43e1d1
Add WebFinger test for AP-only account
2019-07-25 01:27:34 +09:00
acd20914ec
Merge branch 'fix/Upload_base_url' into 'develop'
...
Fix/upload base url
See merge request pleroma/pleroma!1484
2019-07-24 15:35:25 +00:00
feld
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
2019-07-24 15:35:25 +00:00
0e2b5a3e6a
WIP
2019-07-24 17:25:11 +02:00
ac27b94ffa
Change to not require `magic-public-key` on WebFinger
2019-07-25 00:21:32 +09:00
7286cdff7a
Merge branch 'tests/web_finger' into 'develop'
...
tests WebFinger
See merge request pleroma/pleroma!1483
2019-07-24 15:13:11 +00:00
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
b7fae304d3
Merge branch 'domain-blocking-relationship-api' into 'develop'
...
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
See merge request pleroma/pleroma!1481
2019-07-24 15:12:27 +00:00
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
877575d0da
fixup! Update changelog
2019-07-24 17:07:51 +02:00
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
91d9fdc7de
Update changelog to document expiring posts feature
2019-07-24 16:48:34 +02:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
2019-07-24 14:47:22 +02:00
kaniini
feld