aboutsummaryrefslogtreecommitdiff
path: root/mix.lock
AgeCommit message (Collapse)Author
2019-05-01Update `auto_linker`Egor Kislitsyn
2019-04-30Merge developRoman Chvanikov
2019-04-26mix: add bbcode dependencyWilliam Pitcock
2019-04-20Digest emailsRoman Chvanikov
2019-04-17Resolve conflictsRoman Chvanikov
2019-04-16Bump ex_docrinpatch
2019-04-12Revert "simplify mentions escape"Egor
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # docs/config.md # test/support/factory.ex
2019-04-06Pin recon dependency to 2.4.0Mark Felder
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-04Add ability to ship logs to a Slack channelfeld
2019-04-04Add reconhref
2019-04-03Update `auto_linker` dependencyEgor Kislitsyn
2019-04-01[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-03-31BBS: Some more functionality.lain
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-27[#923] OAuth consumer improvements, fixes, refactoring.Ivan Tashkinov
2019-03-20[#923] Support for multiple OAuth consumer strategies.Ivan Tashkinov
2019-03-20Ecto 3.0.5 migrationrinpatch
kms
2019-03-11Sign in via Twitter (WIP).Ivan Tashkinov
2019-03-04Add status text to notifications (mentions and reposts)Maxim Filippov
2019-02-28mix: update dependencies for cowboy 2.0William Pitcock
2019-02-26AutoLinkerEgor
2019-02-22Upate meck to fix tests on MacOSMark Felder
2019-02-21mix: add timex dependencyWilliam Pitcock
2019-02-14[#468] User UI for OAuth permissions restriction. Standardized storage ↵Ivan Tashkinov
format for `scopes` fields, updated usages.
2019-01-06Install ex_sysloggerHaelwenn (lanodan) Monnier
2019-01-01Add OGP parserMaxim Filippov
2019-01-01Update Tesla and Hackney.lain
2018-12-17Switch to phoenixframework/phoenix as the needed change is merged.href
2018-12-17Integration tests for mastodon websockethref
2018-12-16Upgrade to Phoenix 1.4href
2018-12-14fix markdown formattingMaksim Pechnikov
2018-12-12[#114] SMTP deps and config.Ivan Tashkinov
2018-12-06Merge branch 'develop' into feature/compat/push-subscriptionsEgor Kislitsyn
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex
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-04init tesla and updated the http requests in Pleroma.Web.WebsubMaksim Pechnikov
2018-11-27Revert "Merge branch 'chore/mix-lock-update' into 'develop'"kaniini
This reverts merge request !480
2018-11-28Add ex_doc & makeup_elixir to mix.lockMaxim Filippov
2018-11-10Add ex_docHaelwenn (lanodan) Monnier
2018-11-03Add CORSPlug to make web-based OAuth easier.lain
2018-10-05Revert "Merge branch 'revert-a26d5e6b' into 'develop'"William Pitcock
This reverts commit d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing changes made to 340ab3cb9068d444b77213e07beb8c2c3ca128b9.
2018-09-05Update Mix.locklain
2018-08-31Revert "Merge branch 'feature/rich-text' into 'develop'"lambda
This reverts merge request !309
2018-08-31common api: add support for formatting messages outside of twitter-style ↵William Pitcock
plain text
2018-08-27mix: add ex_aws and ex_aws_s3 dependenciesWilliam Pitcock
2018-08-16update mix.lockWilliam Pitcock