summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-16Merge branch 'bugfix/ldap-test-fix' into 'develop'kaniini
test: fix defective ldap setup/teardown See merge request pleroma/pleroma!943
2019-03-16test: fix defective ldap setup/teardownWilliam Pitcock
2019-03-16oauth: add me property to token responsesWilliam Pitcock
2019-03-16Merge branch 'mark-notifications-as-read' into 'develop'kaniini
Allow to mark a single notification as read See merge request pleroma/pleroma!941
2019-03-15Allow to mark a single notification as readeugenijm
2019-03-15Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into ↵kaniini
'develop' MediaProxy: parse filename from content-disposition for non-whitelisted types See merge request pleroma/pleroma!936
2019-03-15Merge branch 'feature/openldap-support' into 'develop'kaniini
OpenLDAP support Closes #203 See merge request pleroma/pleroma!859
2019-03-15Merge branch 'enable-dedupe-by-default' into 'develop'kaniini
Enable dedupe by default See merge request pleroma/pleroma!939
2019-03-15Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'kaniini
Fix headers and add !929 docs to extras See merge request pleroma/pleroma!940
2019-03-15Add tests for LDAP authorizationlink0ff
2019-03-15Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
2019-03-15[#923] OAuth: prototype of sign in / sign up with Twitter.Ivan Tashkinov
2019-03-15remove unused functionKaren Konou
2019-03-15fix credo warningKaren Konou
2019-03-15formattingKaren Konou
2019-03-15Fix streamer testKaren Konou
2019-03-15Refactor to store user ap_id, add testsKaren Konou
2019-03-15formattingKaren Konou
2019-03-15refactor filtering mechanismKaren Konou
2019-03-15Fix elixir 1.8 vs 1.7 format conflictKaren Konou
2019-03-15Add ActivityPub.contain_activity checks to streamerKaren Konou
2019-03-15Fix tests to assume reblogs shown by defaultKaren Konou
2019-03-15Implement mastodon's reblog hiding featureKaren Konou
2019-03-15Fix headers and add !929 docs to extrasHaelwenn (lanodan) Monnier
[ci skip]
2019-03-15Merge branch 'mastoapi/mime_type' into 'develop'Haelwenn
Extend MastoAPI to provide attachment mimetypes See merge request pleroma/pleroma!938
2019-03-15Enable dedupe by defaultrinpatch
2019-03-15Extend MastoAPI to provide attachment mimetypesrinpatch
2019-03-15Content-Disposition regex improvementsrinpatch
2019-03-15Merge branch 'notifications-is-seen' into 'develop'kaniini
MastoAPI notifications is_seen See merge request pleroma/pleroma!934
2019-03-15Merge branch 'robotstxt' into 'develop'kaniini
Add robots.txt Closes #723 See merge request pleroma/pleroma!929
2019-03-15robots.txtWilliam Pearson
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-15MediaProxy: parse filename from content-disposition for non-whitelisted typesrinpatch
2019-03-15Add `is_seen` to MastoAPI notifications, extract rendering logic into ↵eugenijm
separate NotificationView, add tests
2019-03-14Merge branch 'fix/filename-mangling' into 'develop'kaniini
Stop mangling filenames and enable dedupe by default Closes #715 See merge request pleroma/pleroma!927
2019-03-14activitypub: inject to/cc fields on non-forwarded reports since Flag ↵William Pitcock
activities are now Forwardable
2019-03-14reports: unify sending e-mail for both remote and local reportsWilliam Pitcock
2019-03-14activitypub: add support for forwarding reportsWilliam Pitcock
2019-03-14Merge develop to bump elixir version in the CI so I don't get failing formattingrinpatch
2019-03-14common api: add support for forwarding reportsWilliam Pitcock
2019-03-14activitypub: utils: also match Activity objectsWilliam Pitcock
2019-03-14Fix uploaded media plug testrinpatch
2019-03-14activitypub: transmogrifier: accept remote Flag activitiesWilliam Pitcock
2019-03-14activitypub: utils: rework make_flag_data to accept either activity payloads ↵William Pitcock
or IRIs
2019-03-14test: add a test for accepting inbound Flag activitiesWilliam Pitcock
2019-03-14Add some testsrinpatch
2019-03-14Merge branch 'hotfix/delete-activities' into 'develop'rinpatch
Fix delete activities not federating See merge request pleroma/pleroma!933
2019-03-14Fix delete activities not federatingrinpatch
2019-03-14Merge remote-tracking branch 'upstream/develop' into feature/openldap-supportlink0ff
2019-03-14Merge branch 'admin-api-account-view-namespace' into 'develop'kaniini
MastodonAPI.Admin.AccountView → AdminAPI.AccountView See merge request pleroma/pleroma!930
2019-03-14Merge branch 'feature/add-local-to-users-admin-api' into 'develop'kaniini
Add "local" & "tags" to users admin API See merge request pleroma/pleroma!932