aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-05Mock :crypt.crypt/2 because otherwise the test fails on Mac OSSergey Suprunenko
2019-04-05Merge branch 'revert-8607ae68' into 'develop'rinpatch
2019-04-05Revert "Merge branch 'test-coverage' into 'develop'"rinpatch
2019-04-05Merge branch 'test-coverage' into 'develop'rinpatch
2019-04-05Use --cover option when running CI testsoptikfluffel
2019-04-05Merge branch 'feature/admin-api-follow' into 'develop'feld
2019-04-05We actually want the user id not nickname in the test...Mark Felder
2019-04-05Also remove Repo functions in the testsMark Felder
2019-04-05Redundant Repo.get_by usage was recently removed from the codebaseMark Felder
2019-04-05Document the admin API endpoints for controlling follow/unfollowMark Felder
2019-04-05Add user following / unfollowing to the admin api.Roger Braun
2019-04-05Merge branch 'hotfix/html-sanitization' into 'develop'lambda
2019-04-05Refactor html caching functions to have a key instead of a module, use more c...rinpatch
2019-04-04Merge branch 'feature/quack' into 'develop'feld
2019-04-04Add ability to ship logs to a Slack channelfeld
2019-04-04Merge branch 'fix/add-oauth-token-indexes' into 'develop'lambda
2019-04-04Merge branch 'features/pleroma-tan-mastofe' into 'develop'lambda
2019-04-04mastodon_api_controller.ex: Add pleroma-tan to initial_stateHaelwenn (lanodan) Monnier
2019-04-03Merge branch 'feature/robotstxt' into 'develop'lambda
2019-04-03Generate permissive or restrictive robots.txt in the config generatorSachin Joshi
2019-04-03Merge branch 'update-autolinker' into 'develop'lambda
2019-04-03adding indexes to oauth_tokens tableAlex S
2019-04-03Update `auto_linker` dependencyEgor Kislitsyn
2019-04-03Merge branch 'fix/preview-not-working-with-form-data' into 'develop'lambda
2019-04-02Fix preview not being usable in form datarinpatch
2019-04-02Merge branch 'fix-slow-relationships' into 'develop'Haelwenn
2019-04-02Merge branch 'bugfix/wrong-date-format' into 'develop'lambda
2019-04-02Merge branch 'feature/fake-statuses' into 'develop'lambda
2019-04-02Merge remote-tracking branch 'origin/develop' into fix-slow-relationshipslain
2019-04-02ActivityPub Utils: Greatly speed up the follow / block activity fetching.lain
2019-04-02Merge branch 'bugfix/share-mastodon' into 'develop'lambda
2019-04-02Merge branch 'remove-user-activities' into 'develop'lambda
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
2019-04-02Merge branch 'features/pleroma-tan' into 'develop'lambda
2019-04-02Rename fake param to preview and make the tests check that the object was not...rinpatch
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(ni...Egor Kislitsyn
2019-04-02Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'lambda
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
2019-04-02Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'lambda
2019-04-02Fix account lookup for nicknames beginning with numberscascode
2019-04-02replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`Egor Kislitsyn
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(ni...Egor Kislitsyn
2019-04-02Added "GET /oauth/authorize" tests.Ivan Tashkinov
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in testsEgor Kislitsyn
2019-04-02change `Repo.get(User, id)` => `User.get_by_id(id)`Egor Kislitsyn
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`Egor Kislitsyn
2019-04-02Ignore dates in wrong formatsSergey Suprunenko
2019-04-02add `user delete_activities` mix taskEgor Kislitsyn
2019-04-02Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'lambda
2019-04-02Merge remote-tracking branch 'pleroma/develop' into remove-user-activitiesEgor Kislitsyn