aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-01-05Merge branch 'fix/user-search-null-name' into 'develop'kaniini
2019-01-05Merge branch 'fix_486' 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-05Add tests for emoji and lack of HTML in summaries.scarlett
2019-01-05Remove redundant comma.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-04fix 486: Add option --assume-yes to allow it to work non-interactivespctrl
2019-01-04Merge branch 'feature/rich-media' into 'develop'kaniini
2019-01-04Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini
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
2019-01-03Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'kaniini
2019-01-03Remove media proxy examples in config/config.exshref
2019-01-03Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini
2019-01-03Merge branch 'captcha' into 'develop'rinpatch
2019-01-03Merge branch 'fix-chat' 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-02Merge branch 'fix/reserve-media-username' into 'develop'rinpatch
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
2019-01-01Merge branch 'configurable-federator' into 'develop'rinpatch
2019-01-01Merge branch '2019-1-1-update-frontend' into 'develop'lambda
2019-01-01update frontendlain
2019-01-01Add documentation.lain
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-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