aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-01-05Merge branch 'fix/user-search-null-name' into 'develop'kaniini
fix user search results for users with unset display name Closes #499 See merge request pleroma/pleroma!625
2019-01-05Merge branch 'fix_486' into 'develop'kaniini
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive See merge request pleroma/pleroma!627
2019-01-05Merge branch 'activitypub-tombstone-fix' into 'develop'kaniini
Don't crash on AP request for tombstone See merge request pleroma/pleroma!630
2019-01-05Merge branch 'emoji-in-summary' into 'develop'scarlett
Strip HTML in and allow emoji in summaries. See merge request pleroma/pleroma!631
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
Because tombstone objects has no addressing the is_public?-predicate would cause an error that propagated as a 500 error in the api
2019-01-04Merge branch 'develop' of git.pleroma.social:cascode/pleroma into ↵cascode
fix/user-search-null-name
2019-01-04Merge branch 'feature/rich-media-cachex' into 'develop'rinpatch
rich media: use cachex to avoid flooding remote servers See merge request pleroma/pleroma!629
2019-01-04rich media: disable cachex in test modeWilliam Pitcock
2019-01-04Merge branch 'fix/html-cache-content-collision' into 'develop'kaniini
Different caches based on the module. Remove scrubber version since it is not relevant anymore See merge request pleroma/pleroma!628
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 ↵Rin Toshaka
not relevant anymore
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-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 '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-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-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
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 '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-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-31update copyright years to 2019William Pitcock
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-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-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