aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
2019-01-05Merge branch 'fix/user-search-null-name' into 'develop'kaniini
2019-01-05Merge branch 'activitypub-tombstone-fix' into 'develop'kaniini
2019-01-05Merge branch 'emoji-in-summary' into 'develop'scarlett
2019-01-05Resolve some test failures.scarlett
2019-01-05add some brakets to the emoji list.scarlett
2019-01-05Strip HTML in and allow emoji in summaries.scarlett
2019-01-05Don't crash on AP request for tombstonesxsdv1
2019-01-04Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-se...cascode
2019-01-04Merge branch 'feature/rich-media-cachex' into 'develop'rinpatch
2019-01-04rich media: disable cachex in test modeWilliam Pitcock
2019-01-04Merge branch 'fix/html-cache-content-collision' into 'develop'kaniini
2019-01-04rich media: use cachex to avoid flooding remote serversWilliam Pitcock
2019-01-05oopsiesRin Toshaka
2019-01-05Different caches based on the module. Remove scrubber version since it is not...Rin Toshaka
2019-01-04Merge branch 'feature/rich-media' into 'develop'kaniini
2019-01-04Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini
2019-01-04handle nullcascode
2019-01-03Merge branch 'mr/retry-queue-remove-fold' into 'develop'kaniini
2019-01-03Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini
2019-01-03Merge branch 'captcha' into 'develop'rinpatch
2019-01-02user: check that the follow request actually has an active account associated...William Pitcock
2019-01-02rewrites List.foldl to Enum.eachMichael Loftis
2019-01-02Add RichMediaController and testsMaxim Filippov
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
2019-01-01Merge branch 'configurable-federator' into 'develop'rinpatch
2019-01-01Merge branch 'cleanup/admin-api-useless-if' into 'develop'lambda
2019-01-01Make Federator options configurable.lain
2019-01-01Merge remote-tracking branch 'origin/develop' into pool-usagelain
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
2018-12-31update copyright years to 2019William Pitcock
2018-12-31Merge branch 'fix/scrubber-cache' into 'develop'lambda
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
2018-12-30Resolve merge conflictRin Toshaka
2018-12-30Fix comment in object.exRin Toshaka
2018-12-30shame on me for not testing after revertRin Toshaka
2018-12-30Fix formating. Aparently my pre-commit hook broke.Rin Toshaka
2018-12-30Revert some changes in html.exRin Toshaka
2018-12-30Friendship ended with Postgresql now Cachex is my best friendRin Toshaka
2018-12-30Friendship ended with Postgresql now Cachex is my best friendRin Toshaka
2018-12-30Added get_stripped_html_for_object. Renamed a few thingsRin Toshaka
2018-12-30Improves RetryQueue behaviorMichael Loftis
2018-12-30Tidy up the code. Rename key to signatureRin Toshaka