Commit graph

4297 commits

Author SHA1 Message Date
kaniini
6d6f48d079 Merge branch 'feature/federated-flags' into 'develop'
Federated reports

See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
lambda
28df397454 Merge branch 'feature/oauth-me' into 'develop'
oauth: add me property to token responses

See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
kaniini
c69dc2acf1 Merge branch 'feature/reblog-muting' into 'develop'
Implement mastodon's reblog hiding feature

See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
kaniini
f58d47d6f7 Merge branch 'bugfix/ldap-test-fix' into 'develop'
test: fix defective ldap setup/teardown

See merge request pleroma/pleroma!943
2019-03-16 04:13:53 +00:00
William Pitcock
40134598a8 test: fix defective ldap setup/teardown 2019-03-16 04:05:19 +00:00
William Pitcock
e0edc706cf oauth: add me property to token responses 2019-03-16 01:12:50 +00:00
kaniini
532e8b0a43 Merge branch 'mark-notifications-as-read' into 'develop'
Allow to mark a single notification as read

See merge request pleroma/pleroma!941
2019-03-16 00:30:04 +00:00
eugenijm
43fb03be5a Allow to mark a single notification as read 2019-03-15 23:56:14 +03:00
kaniini
4b3c86c1a6 Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
MediaProxy: parse filename from content-disposition for non-whitelisted types

See merge request pleroma/pleroma!936
2019-03-15 20:06:08 +00:00
kaniini
8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
kaniini
acf215d983 Merge branch 'enable-dedupe-by-default' into 'develop'
Enable dedupe by default

See merge request pleroma/pleroma!939
2019-03-15 19:53:25 +00:00
kaniini
b010f9733d Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'
Fix headers and add !929 docs to extras

See merge request pleroma/pleroma!940
2019-03-15 19:51:06 +00:00
link0ff
a070dd4a83 Add tests for LDAP authorization 2019-03-15 16:28:46 +02:00
d8244c2a1b remove unused function 2019-03-15 15:03:03 +01:00
dfeb3aec44 fix credo warning 2019-03-15 14:36:07 +01:00
094e1ef048 formatting 2019-03-15 14:28:14 +01:00
ebfc10c834 Fix streamer test 2019-03-15 14:20:08 +01:00
da53c079db Refactor to store user ap_id, add tests 2019-03-15 14:20:08 +01:00
be465c762b formatting 2019-03-15 14:18:53 +01:00
15b21d1983 refactor filtering mechanism 2019-03-15 14:18:53 +01:00
aa71139e4a Fix elixir 1.8 vs 1.7 format conflict 2019-03-15 14:18:53 +01:00
fe4c1d26fc Add ActivityPub.contain_activity checks to streamer 2019-03-15 14:18:53 +01:00
13c298d354 Fix tests to assume reblogs shown by default 2019-03-15 14:18:21 +01:00
c8f31e0bc2 Implement mastodon's reblog hiding feature 2019-03-15 14:18:21 +01:00
Haelwenn (lanodan) Monnier
f5b54acc81
Fix headers and add !929 docs to extras
[ci skip]
2019-03-15 10:58:15 +01:00
Haelwenn
41fc67aa49 Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes

See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
28cfb2c37a Enable dedupe by default 2019-03-15 12:11:13 +03:00
rinpatch
d7a34b604b Extend MastoAPI to provide attachment mimetypes 2019-03-15 11:58:12 +03:00
rinpatch
d02f1120f9 Content-Disposition regex improvements 2019-03-15 08:29:51 +03:00
kaniini
0f42ea87d6 Merge branch 'notifications-is-seen' into 'develop'
MastoAPI notifications is_seen

See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
kaniini
c708656b5e Merge branch 'robotstxt' into 'develop'
Add robots.txt

Closes #723

See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
William Pearson
3dadaa4432 robots.txt
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
rinpatch
958227d556 MediaProxy: parse filename from content-disposition for non-whitelisted types 2019-03-15 01:36:29 +03:00
eugenijm
100413bf2c Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests 2019-03-15 01:35:48 +03:00
kaniini
7ecc201029 Merge branch 'fix/filename-mangling' into 'develop'
Stop mangling filenames and enable dedupe by default

Closes #715

See merge request pleroma/pleroma!927
2019-03-14 21:47:02 +00:00
William Pitcock
423fd07928 activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable 2019-03-14 19:52:08 +00:00
William Pitcock
5c7b774f09 reports: unify sending e-mail for both remote and local reports 2019-03-14 19:44:08 +00:00
William Pitcock
64b0120d67 activitypub: add support for forwarding reports 2019-03-14 19:36:17 +00:00
rinpatch
cbdd11c381 Merge develop to bump elixir version in the CI so I don't get failing formatting 2019-03-14 22:33:20 +03:00
William Pitcock
3b48d5f0c2 common api: add support for forwarding reports 2019-03-14 19:29:33 +00:00
William Pitcock
379442ad17 activitypub: utils: also match Activity objects 2019-03-14 19:29:04 +00:00
rinpatch
355f285a86 Fix uploaded media plug test 2019-03-14 22:26:54 +03:00
William Pitcock
0f3ecb2bfb activitypub: transmogrifier: accept remote Flag activities 2019-03-14 19:06:02 +00:00
William Pitcock
f86f7dbb8f activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs 2019-03-14 19:05:42 +00:00
William Pitcock
414d4b8088 test: add a test for accepting inbound Flag activities 2019-03-14 19:04:33 +00:00
rinpatch
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03:00
rinpatch
34fc0dca2e Merge branch 'hotfix/delete-activities' into 'develop'
Fix delete activities not federating

See merge request pleroma/pleroma!933
2019-03-14 17:49:00 +00:00
rinpatch
e630e5e135 Fix delete activities not federating 2019-03-14 20:43:14 +03:00
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
kaniini
59333f2d56 Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView

See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00