Ivan Tashkinov
b6f915313f
Made auth customization be runtime-configurable.
5 years ago
Ivan Tashkinov
e98d34e5fb
Added missing copyright headers.
5 years ago
Ivan Tashkinov
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
5 years ago
Ivan Tashkinov
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
5 years ago
Haelwenn
03afee3fd1
Merge branch 'nginx-cfg' into 'develop'
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
5 years ago
PEA
d3a6c065a4
Add ipv6 handling to pleroma.nginx
Replaces `listen 80` with `listen [::]:80`, same with 443
5 years ago
kaniini
2ed7003c26
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'
twitter card: remove IO.inspect() spam
See merge request pleroma/pleroma!863
5 years ago
William Pitcock
fc9d895ebc
twitter card: remove IO.inspect() spam
5 years ago
kaniini
7daa9a8c42
Merge branch 'add-apache-cache-config' into 'develop'
apache config: add instructions for mediaproxy.
See merge request pleroma/pleroma!856
5 years ago
kaniini
101c20f8d9
Merge branch 'card-handling' into 'develop'
Private card handling
Closes #652
See merge request pleroma/pleroma!854
5 years ago
kaniini
ab2d2dfa7b
Merge branch 'fix/meck' into 'develop'
Update meck to fix tests on MacOS
Closes #662
See merge request pleroma/pleroma!855
5 years ago
faried nawaz
c75e643a72
apache config: add instructions for mediaproxy.
5 years ago
Mark Felder
bf562a6ecc
Upate meck to fix tests on MacOS
5 years ago
lain
9e0686efa6
Move visibility into own module.
5 years ago
href
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
5 years ago
lain
62296f5a25
Fix private post card handling.
5 years ago
Ivan Tashkinov
b227ccab82
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.
5 years ago
Ivan Tashkinov
afddce45b3
Minor setting name adjustment (:app_template -> :app_layout).
5 years ago
kaniini
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
Fix Twitter Cards
See merge request pleroma/pleroma!815
5 years ago
kaniini
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
5 years ago
KZ
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
5 years ago
Ivan Tashkinov
1097ce6d9f
Auth customization support.
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
5 years ago
lambda
2813f28b6f
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
5 years ago
lambda
19bd799bd7
Merge branch 'bugfix/as2-accept-json' into 'develop'
accept application/json mimetype for fetching AS2 objects
See merge request pleroma/pleroma!846
5 years ago
lambda
45b06860d3
Merge branch '2019-02-21-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!850
5 years ago
lain
553ce57d42
update frontend
5 years ago
William Pitcock
f8a72f2997
activitypub: sign http date header
5 years ago
William Pitcock
1c87102d01
mix: add timex dependency
5 years ago
William Pitcock
e95dbecf3e
tests: fix formatting
5 years ago
William Pitcock
1803d9a022
fix fetching AP objects with application/json
5 years ago
William Pitcock
aa45674be6
tests: add test for fetching AP objects with application/json.
5 years ago
lambda
1f85c9c9c7
Merge branch 'feature/improve-error-logging' into 'develop'
logging: improve visibility into ISE errors
See merge request pleroma/pleroma!845
5 years ago
William Pitcock
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
5 years ago
William Pitcock
3ee77e95b2
tests: fix tests
5 years ago
William Pitcock
8b08096436
logging: improve visibility into ISE errors
5 years ago
kaniini
54f9e3d382
Merge branch 'feature/reports' into 'develop'
Reports
Closes #83
See merge request pleroma/pleroma!701
5 years ago
Egor
bff9eb5ef7
Reports
5 years ago
kaniini
77fb926afa
Merge branch 'nicer-share-urls' into 'develop'
Add some nicer urls in status view.
See merge request pleroma/pleroma!844
5 years ago
lain
59c27f29c8
Add some nicer urls in status view.
5 years ago
lambda
dff5e1e46a
Merge branch '468_oauth2_scopes' into 'develop'
[#468 ] OAuth2 scopes
Closes #468
See merge request pleroma/pleroma!799
5 years ago
Ivan Tashkinov
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
5 years ago
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
5 years ago
lambda
11b3c10c54
Merge branch 'muting' into 'develop'
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
5 years ago
lain
4196d9af11
Add test for User.mutes and so on.
5 years ago
lain
9ae79bb71a
Add test for muting functionality.
5 years ago
lain
840d2c9f0b
Remove superfluous migration.
5 years ago
Ivan Tashkinov
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
5 years ago
Ivan Tashkinov
337367d764
[ #468 ] More OAuth scopes-specific tests.
5 years ago
kaniini
abd0b85efd
Merge branch 'set-activation-status-admin-api' into 'develop'
Added admin API for changing user activation status
See merge request pleroma/pleroma!843
5 years ago
Ekaterina Vaartis
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)
5 years ago