1c265b3b19
Merge branch 'auto_linker' into 'develop'
...
AutoLinker
Closes #609
See merge request pleroma/pleroma!839
6 years ago
c3ac9424d2
AutoLinker
6 years ago
e9703a5326
Merge branch 'feature/more-actions-to-admin-api' into 'develop'
...
Add list/toggle activation endpoints to AdminController
See merge request pleroma/pleroma!867
6 years ago
90d0d055fc
Add more admin actions
6 years ago
b985c91431
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
...
need to put back ipv4 listen instruct
See merge request pleroma/pleroma!866
6 years ago
e1bdaaa3fe
need to put back ipv4 listen instruct
6 years ago
03afee3fd1
Merge branch 'nginx-cfg' into 'develop'
...
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
6 years ago
d3a6c065a4
Add ipv6 handling to pleroma.nginx
...
Replaces `listen 80` with `listen [::]:80`, same with 443
6 years ago
2ed7003c26
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'
...
twitter card: remove IO.inspect() spam
See merge request pleroma/pleroma!863
6 years ago
fc9d895ebc
twitter card: remove IO.inspect() spam
6 years ago
7daa9a8c42
Merge branch 'add-apache-cache-config' into 'develop'
...
apache config: add instructions for mediaproxy.
See merge request pleroma/pleroma!856
6 years ago
101c20f8d9
Merge branch 'card-handling' into 'develop'
...
Private card handling
Closes #652
See merge request pleroma/pleroma!854
6 years ago
ab2d2dfa7b
Merge branch 'fix/meck' into 'develop'
...
Update meck to fix tests on MacOS
Closes #662
See merge request pleroma/pleroma!855
6 years ago
c75e643a72
apache config: add instructions for mediaproxy.
6 years ago
bf562a6ecc
Upate meck to fix tests on MacOS
6 years ago
9e0686efa6
Move visibility into own module.
6 years ago
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
6 years ago
62296f5a25
Fix private post card handling.
6 years ago
b227ccab82
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.
6 years ago
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
6 years ago
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
6 years ago
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
6 years ago
2813f28b6f
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
...
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
6 years ago
19bd799bd7
Merge branch 'bugfix/as2-accept-json' into 'develop'
...
accept application/json mimetype for fetching AS2 objects
See merge request pleroma/pleroma!846
6 years ago
45b06860d3
Merge branch '2019-02-21-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!850
6 years ago
553ce57d42
update frontend
6 years ago
f8a72f2997
activitypub: sign http date header
6 years ago
1c87102d01
mix: add timex dependency
6 years ago
e95dbecf3e
tests: fix formatting
6 years ago
1803d9a022
fix fetching AP objects with application/json
6 years ago
aa45674be6
tests: add test for fetching AP objects with application/json.
6 years ago
1f85c9c9c7
Merge branch 'feature/improve-error-logging' into 'develop'
...
logging: improve visibility into ISE errors
See merge request pleroma/pleroma!845
6 years ago
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
6 years ago
3ee77e95b2
tests: fix tests
6 years ago
8b08096436
logging: improve visibility into ISE errors
6 years ago
54f9e3d382
Merge branch 'feature/reports' into 'develop'
...
Reports
Closes #83
See merge request pleroma/pleroma!701
6 years ago
bff9eb5ef7
Reports
6 years ago
77fb926afa
Merge branch 'nicer-share-urls' into 'develop'
...
Add some nicer urls in status view.
See merge request pleroma/pleroma!844
6 years ago
59c27f29c8
Add some nicer urls in status view.
6 years ago
dff5e1e46a
Merge branch '468_oauth2_scopes' into 'develop'
...
[#468 ] OAuth2 scopes
Closes #468
See merge request pleroma/pleroma!799
6 years ago
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
6 years ago
4196d9af11
Add test for User.mutes and so on.
6 years ago
9ae79bb71a
Add test for muting functionality.
6 years ago
840d2c9f0b
Remove superfluous migration.
6 years ago
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
6 years ago
337367d764
[ #468 ] More OAuth scopes-specific tests.
6 years ago
abd0b85efd
Merge branch 'set-activation-status-admin-api' into 'develop'
...
Added admin API for changing user activation status
See merge request pleroma/pleroma!843
6 years ago
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
6 years ago
kaniini