summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-04fix 486: Add option --assume-yes to allow it to work non-interactivespctrl
2019-01-04Merge branch 'feature/rich-media' into 'develop'kaniini
URL previews in posts Closes #402 See merge request pleroma/pleroma!617
2019-01-04Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini
Activitypub c2s delete activity See merge request pleroma/pleroma!618
2019-01-04formattedcascode
2019-01-04added test for #499cascode
2019-01-04handle nullcascode
2019-01-03Merge branch 'mr/retry-queue-remove-fold' into 'develop'kaniini
rewrites List.foldl to Enum.each in RetryQueue See merge request pleroma/pleroma!621
2019-01-03Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'kaniini
Remove media proxy examples in config/config.exs See merge request pleroma/pleroma!624
2019-01-03Remove media proxy examples in config/config.exshref
1. this was overriding the real defaults 2. it's documented in `config/config.md`
2019-01-03Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini
user: check that the follow request actually has an active account associated with it See merge request pleroma/pleroma!623
2019-01-03Merge branch 'captcha' into 'develop'rinpatch
Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585
2019-01-03Merge branch 'fix-chat' into 'develop'rinpatch
Add handler for Phoenix-style socket. See merge request pleroma/pleroma!619
2019-01-02user: check that the follow request actually has an active account ↵William Pitcock
associated with it because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly filter the follow requests for these failures.
2019-01-02rewrites List.foldl to Enum.eachMichael Loftis
2019-01-02Merge branch 'fix/reserve-media-username' into 'develop'rinpatch
Reserve /media See merge request pleroma/pleroma!620
2019-01-02reserve /mediaRin Toshaka
2019-01-02Add RichMediaController and testsMaxim Filippov
2019-01-02Add handler for Phoenix-style socket.lain
2019-01-01Implement delete activitysxsdv1
2019-01-01Split create activity specifics from update_outboxsxsdv1
2019-01-01Better variable nameMaxim Filippov
2019-01-01Add OGP parserMaxim Filippov
2019-01-01Merge branch 'pool-usage' into 'develop'kaniini
Update of hackney and tesla, removal of superflous default options. See merge request pleroma/pleroma!614
2019-01-01Merge branch 'configurable-federator' into 'develop'rinpatch
Make Federator options configurable. See merge request pleroma/pleroma!615
2019-01-01Merge branch '2019-1-1-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!616
2019-01-01update frontendlain
2019-01-01Add documentation.lain
2019-01-01Merge branch 'cleanup/admin-api-useless-if' into 'develop'lambda
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete See merge request pleroma/pleroma!612
2019-01-01Make Federator options configurable.lain
2019-01-01Merge remote-tracking branch 'origin/develop' into pool-usagelain
2019-01-01Update Tesla and Hackney.lain
2019-01-01Remove default pool, it's used automatically anyway.lain
2018-12-31Web.AdminAPI.AdminAPIController: Remove a useless if in user_deleteHaelwenn (lanodan) Monnier
2018-12-31Merge branch 'features/admin-api-user-views' into 'develop'kaniini
User/Account views: Add rights.admin Closes #472 See merge request pleroma/pleroma!589
2018-12-31Merge branch 'docs/admin-api' into 'develop'kaniini
Add docs/Admin-API.md See merge request pleroma/pleroma!611
2018-12-31Merge branch 'maintenance/copyright-2019' into 'develop'kaniini
update copyright years to 2019 See merge request pleroma/pleroma!613
2018-12-31update copyright years to 2019William Pitcock
2018-12-31Add docs/Admin-API.mdHaelwenn (lanodan) Monnier
[ci skip]
2018-12-31Merge branch 'fix/scrubber-cache' into 'develop'lambda
[#481] Store scrubbed posts in Cachex Closes #481 See merge request pleroma/pleroma!610
2018-12-31Fix a typo in user_test.exRin Toshaka
2018-12-31Eh?Rin Toshaka
2018-12-31Move scrubber cache-related functions to Pleroma.HTMLRin Toshaka
2018-12-30Merge branch 'mr/retry-queue' into 'develop'kaniini
Improves RetryQueue behavior See merge request pleroma/pleroma!609
2018-12-31Get default scrubbers from config instead of hardcodedrinpatch
2018-12-31Fix test failurerinpatch
2018-12-30Resolve merge conflictRin Toshaka
2018-12-30Fix comment in object.exRin Toshaka
2018-12-30Merge branch 'activitypub-c2s' into 'develop'kaniini
Activitypub c2s See merge request pleroma/pleroma!608
2018-12-30shame on me for not testing after revertRin Toshaka
2018-12-30Fix formating. Aparently my pre-commit hook broke.Rin Toshaka