summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-06Merge branch 'develop' into feature/compat/push-subscriptionsEgor Kislitsyn
# Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock
2018-12-06Add web push supportEgor Kislitsyn
2018-12-06Use object.normalize.scarlett
2018-12-06avoid mix format bugHakaba Hitoyo
2018-12-06Merge branch '210_twitter_api_uploads_alt_text' into 'develop'kaniini
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix. See merge request pleroma/pleroma!496
2018-12-06[#210] Mastodon: actor storing for media uploads, ownership check to ↵Ivan Tashkinov
update_media. Refactoring.
2018-12-06remove follow_redirect optionsHakaba Hitoyo
2018-12-06remove pool and timeout options which duplicate with the defaultHakaba Hitoyo
2018-12-06Merge remote-tracking branch 'origin/debug-suggestions-api' into ↵Hakaba Hitoyo
correct-and-improve-http-options
2018-12-05Merge branch 'follower-hiding' into 'develop'kaniini
Network hiding Closes #356 See merge request pleroma/pleroma!490
2018-12-05Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini
added data-user and data-tag attributes Closes #410 See merge request pleroma/pleroma!504
2018-12-06added data attrs to twitter scrubberVald
2018-12-05Fix merge.lain
2018-12-05Merge remote-tracking branch 'origin' into follower-hidinglain
2018-12-05MastodonAPI: Show users their own network.lain
2018-12-06resolved activity view testVald
2018-12-06lintVald
2018-12-06resolved api and controller test failuresVald
2018-12-05TwitterAPI: Show users their own network.lain
2018-12-06lintingVald
2018-12-06resolved formatter_test failuresVald
2018-12-06added data attrs for user and tagVald
2018-12-05[#210] Stylistic change.Ivan Tashkinov
2018-12-05TwitterAPI: Add network hiding.lain
2018-12-05formatingRin Toshaka
2018-12-05Everything should use Mix.Task.RunRin Toshaka
2018-12-05Merge branch 'support/oauth_fetch_token' into 'develop'lambda
[#273] bugfix/273 See merge request pleroma/pleroma!502
2018-12-05Merge branch 'fix/mix-tasks-userinfo' into 'develop'lambda
Update mix tasks that use User.info.info_changeset since it is deprecated See merge request pleroma/pleroma!503
2018-12-05[#210] Stylistic change.Ivan Tashkinov
2018-12-05Move relay tasks to relay.exRin Toshaka
2018-12-05Switch from User.info_changeset because it is deprecatedRin Toshaka
2018-12-05SorryRin Toshaka
2018-12-05Update mix tasks since User.info.info_changeset is deprecatedRin Toshaka
2018-12-05fix/273Maksim Pechnikov
2018-12-05Merge develop to refactor/mix-tasksRin Toshaka
2018-12-05[#210] Formatting fix.Ivan Tashkinov
2018-12-05[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership checkIvan Tashkinov
to `update_media` action. Added controller tests for `upload` and `update_media` actions. Refactoring.
2018-12-05[#210] Test update (replaced bang- with non-bang method).Ivan Tashkinov
2018-12-05[#210] Further refactoring.Ivan Tashkinov
2018-12-05Merge branch 'bugfix/408' into 'develop'lambda
ensure user info is populated when registering users See merge request pleroma/pleroma!500
2018-12-05debug /api/v1/suggestionshakabahitoyo
2018-12-05tests: add regression test for bug #408William Pitcock
2018-12-05user: put default user info when registering a userWilliam Pitcock
2018-12-04Add a MRF Policy for appending re: to identical subjects in replies.scarlett
2018-12-04Merge branch 'optional-retry-queue' into 'develop'kaniini
Make retry queue optional. See merge request pleroma/pleroma!498
2018-12-04Make retry queue optional.lain
At the moment, it can use a lot of memory really fast.
2018-12-04Merge branch 'feature/integration_tesla' into 'develop'kaniini
[#354] Move all http interactions to Tesla See merge request pleroma/pleroma!487
2018-12-04Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'lambda
bugfix: MRF simple media removal See merge request pleroma/pleroma!497
2018-12-04MRF: simple policy: fix media removalWilliam Pitcock
2018-12-04change new to gen in instance.ex . Refactor user.exRin Toshaka
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 20:28:19 +0000