9cc98b496e
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'
...
mastodon api: embed relationship card under account card for Pleroma FE convenience
See merge request pleroma/pleroma!870
2019-02-28 07:35:26 +00:00
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
2019-02-27 13:01:10 +00:00
14bc6bd40f
Merge branch 'fix/formatter' into 'develop'
...
Bugfix: markdown in formatter
Closes #688
See merge request pleroma/pleroma!869
2019-02-27 08:45:43 +00:00
5d961d536c
fix formatter
2019-02-27 15:40:30 +07:00
a50a47a011
Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'
...
Add missing docs and tests to Admin API
See merge request pleroma/pleroma!868
2019-02-27 07:28:10 +00:00
ed7fd6b47e
Add missing docs and tests
2019-02-27 03:08:03 +03:00
1c265b3b19
Merge branch 'auto_linker' into 'develop'
...
AutoLinker
Closes #609
See merge request pleroma/pleroma!839
2019-02-26 23:32:26 +00:00
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
e9703a5326
Merge branch 'feature/more-actions-to-admin-api' into 'develop'
...
Add list/toggle activation endpoints to AdminController
See merge request pleroma/pleroma!867
2019-02-26 23:31:53 +00:00
90d0d055fc
Add more admin actions
2019-02-27 00:13:38 +03:00
b985c91431
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
...
need to put back ipv4 listen instruct
See merge request pleroma/pleroma!866
2019-02-26 16:47:18 +00:00
e1bdaaa3fe
need to put back ipv4 listen instruct
2019-02-26 08:41:37 -08:00
03afee3fd1
Merge branch 'nginx-cfg' into 'develop'
...
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
2019-02-26 06:56:29 +00:00
d3a6c065a4
Add ipv6 handling to pleroma.nginx
...
Replaces `listen 80` with `listen [::]:80`, same with 443
2019-02-25 23:37:46 -05:00
2ed7003c26
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'
...
twitter card: remove IO.inspect() spam
See merge request pleroma/pleroma!863
2019-02-24 19:03:58 +00:00
fc9d895ebc
twitter card: remove IO.inspect() spam
2019-02-24 18:56:44 +00:00
7daa9a8c42
Merge branch 'add-apache-cache-config' into 'develop'
...
apache config: add instructions for mediaproxy.
See merge request pleroma/pleroma!856
2019-02-23 04:01:21 +00:00
101c20f8d9
Merge branch 'card-handling' into 'develop'
...
Private card handling
Closes #652
See merge request pleroma/pleroma!854
2019-02-23 03:59:23 +00:00
ab2d2dfa7b
Merge branch 'fix/meck' into 'develop'
...
Update meck to fix tests on MacOS
Closes #662
See merge request pleroma/pleroma!855
2019-02-23 03:56:31 +00:00
c75e643a72
apache config: add instructions for mediaproxy.
2019-02-23 00:18:03 +05:00
bf562a6ecc
Upate meck to fix tests on MacOS
2019-02-22 17:26:47 +00:00
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
34646c6923
Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'
...
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`
Closes #660
See merge request pleroma/pleroma!853
2019-02-22 11:16:10 +00:00
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
b227ccab82
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.
2019-02-22 14:00:18 +03:00
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
2019-02-22 04:38:14 +00:00
eeeb8124b9
Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'
...
Fix: Fixing an outbox related bug when local user activity is empty
See merge request pleroma/pleroma!849
2019-02-22 04:37:48 +00:00
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
2019-02-22 04:37:48 +00:00
2813f28b6f
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
...
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
2019-02-21 08:20:06 +00:00
19bd799bd7
Merge branch 'bugfix/as2-accept-json' into 'develop'
...
accept application/json mimetype for fetching AS2 objects
See merge request pleroma/pleroma!846
2019-02-21 08:14:24 +00:00
45b06860d3
Merge branch '2019-02-21-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!850
2019-02-21 08:11:06 +00:00
553ce57d42
update frontend
2019-02-21 09:04:35 +01:00
f8a72f2997
activitypub: sign http date header
2019-02-21 00:23:17 +00:00
1c87102d01
mix: add timex dependency
2019-02-21 00:19:49 +00:00
e95dbecf3e
tests: fix formatting
2019-02-20 20:49:10 +00:00
1803d9a022
fix fetching AP objects with application/json
2019-02-20 20:45:40 +00:00
aa45674be6
tests: add test for fetching AP objects with application/json.
2019-02-20 20:45:09 +00:00
1f85c9c9c7
Merge branch 'feature/improve-error-logging' into 'develop'
...
logging: improve visibility into ISE errors
See merge request pleroma/pleroma!845
2019-02-20 18:21:58 +00:00
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
2019-02-20 17:36:47 +00:00
3ee77e95b2
tests: fix tests
2019-02-20 17:23:05 +00:00
8b08096436
logging: improve visibility into ISE errors
2019-02-20 17:14:18 +00:00
54f9e3d382
Merge branch 'feature/reports' into 'develop'
...
Reports
Closes #83
See merge request pleroma/pleroma!701
2019-02-20 16:51:25 +00:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
77fb926afa
Merge branch 'nicer-share-urls' into 'develop'
...
Add some nicer urls in status view.
See merge request pleroma/pleroma!844
2019-02-20 16:42:52 +00:00
59c27f29c8
Add some nicer urls in status view.
2019-02-20 17:36:16 +01:00
dff5e1e46a
Merge branch '468_oauth2_scopes' into 'develop'
...
[#468 ] OAuth2 scopes
Closes #468
See merge request pleroma/pleroma!799
2019-02-20 16:15:45 +00:00
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
2019-02-20 17:27:41 +03:00
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
2019-02-20 16:48:59 +03:00
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00
4196d9af11
Add test for User.mutes and so on.
2019-02-20 14:14:52 +01:00
lambda