summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-08removing not needed invite updateAlex S
2019-04-08fix for elixir 1.7.4Alex S
2019-04-08test for valid_invite?Alex S
2019-04-08renaming expire_at -> expires_atAlex S
keyword style change
2019-04-07credo fixAlex S
2019-04-07added docs to docs/api/admin_api.mdAlex S
code style and little renamings
2019-04-06little channgesAlex S
2019-04-06fix for field nameAlex S
2019-04-06code styleAlex S
2019-04-06admin api endpoints for invitesAlex S
2019-04-06token -> invite renamingAlex S
2019-04-06twitter api registrationAlex S
fix for twitter api tests
2019-04-06generating tokens with mixAlex S
2019-04-05Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'Haelwenn
Redirect to the referer url after mastofe authorization Closes #717 See merge request pleroma/pleroma!1025
2019-04-05Redirect to the referer url after mastofe authorizationSergey Suprunenko
2019-04-05Merge branch 'revert-8607ae68' into 'develop'rinpatch
Revert "Merge branch 'test-coverage' into 'develop'" See merge request pleroma/pleroma!1028
2019-04-05Revert "Merge branch 'test-coverage' into 'develop'"rinpatch
This reverts merge request !1027
2019-04-05Merge branch 'test-coverage' into 'develop'rinpatch
Use --cover option when running CI tests See merge request pleroma/pleroma!1027
2019-04-05Use --cover option when running CI testsoptikfluffel
2019-04-05Merge branch 'feature/admin-api-follow' into 'develop'feld
Feature/admin api follow See merge request pleroma/pleroma!1026
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
Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi See merge request pleroma/pleroma!1022
2019-04-05Refactor html caching functions to have a key instead of a module, use more ↵rinpatch
correct terminology and fix summaries in mastoapi
2019-04-04Merge branch 'feature/quack' into 'develop'feld
Add ability to ship logs to a Slack channel See merge request pleroma/pleroma!1014
2019-04-04Add ability to ship logs to a Slack channelfeld
2019-04-04Merge branch 'fix/add-oauth-token-indexes' into 'develop'lambda
adding indexes to oauth_tokens table See merge request pleroma/pleroma!1016
2019-04-04Merge branch 'features/pleroma-tan-mastofe' into 'develop'lambda
mastodon_api_controller.ex: Add pleroma-tan to initial_state See merge request pleroma/pleroma!1018
2019-04-04mastodon_api_controller.ex: Add pleroma-tan to initial_stateHaelwenn (lanodan) Monnier
2019-04-03Merge branch 'feature/robotstxt' into 'develop'lambda
Generate permissive or restrictive robots.txt in the config generator See merge request pleroma/pleroma!1012
2019-04-03Generate permissive or restrictive robots.txt in the config generatorSachin Joshi
2019-04-03Merge branch 'update-autolinker' into 'develop'lambda
Update `auto_linker` dependency See merge request pleroma/pleroma!1015
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
Fix preview not being usable in form data See merge request pleroma/pleroma!1013
2019-04-02Fix preview not being usable in form datarinpatch
2019-04-02Merge branch 'fix-slow-relationships' into 'develop'Haelwenn
ActivityPub Utils: Greatly speed up the follow / block activity fetching. See merge request pleroma/pleroma!1011
2019-04-02Merge branch 'bugfix/wrong-date-format' into 'develop'lambda
Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004
2019-04-02Merge branch 'feature/fake-statuses' into 'develop'lambda
Add fake status submit See merge request pleroma/pleroma!995
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
[OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002
2019-04-02Merge branch 'remove-user-activities' into 'develop'lambda
[#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010
2019-04-02Merge branch 'features/pleroma-tan' into 'develop'lambda
priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913
2019-04-02Rename fake param to preview and make the tests check that the object was ↵rinpatch
not inserted to the db
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with ↵Egor Kislitsyn
`User.get_by_nickname(nickname)` in tests