summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-04[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-04Merge branch 'develop' into feature/prometheusMark Felder
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-04[#923] OAuth consumer controller tests. Misc. improvements.Ivan Tashkinov
2019-04-04Code readability tweakMark Felder
2019-04-04Clean merge crumbsMark Felder
2019-04-04Serve metrics at `/api/pleroma/app_metrics`href
2019-04-04Document PrometheusMark Felder
2019-04-04[#1] fix telemetryEgor Kislitsyn
2019-04-04Set up telemetry and prometheushref
2019-04-04Add reconhref
2019-04-04Improve Transmogrifier.upgrade_user_from_ap_id/2Egor Kislitsyn
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-02Merging develop into feature/770-add-emoji-tagsAlex S
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02second level of headertext change in docAlex S
2019-04-02syntax highlightingAlex S
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 develop into feature/770-add-emoji-tagsAlex S
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-02Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
# Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with ↵Egor Kislitsyn
`User.get_by_nickname(nickname)` in tests
2019-04-02Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'lambda
MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible See merge request pleroma/pleroma!1009
2019-04-02Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'lambda
Fix account lookup for nicknames beginning with numbers See merge request pleroma/pleroma!1003
2019-04-02Fix account lookup for nicknames beginning with numberscascode
2019-04-02[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
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 ↵Egor Kislitsyn
`User.get_by_nickname(nickname)`
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 16:31:00 +0000