aboutsummaryrefslogtreecommitdiff
path: root/mix.exs
AgeCommit message (Collapse)Author
2019-05-08Merge developRoman Chvanikov
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
Conversations once more. See merge request pleroma/pleroma!1119
2019-05-07Fix/ex_doc source linksxse
2019-05-04BBS: small fixes.lain
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-03Just have Benchee in all environments.lain
2019-05-03Mix: Also have benchee in test.lain
2019-05-03Search: Add fts index on objects table.lain
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-01Update `auto_linker`Egor Kislitsyn
2019-04-30Merge developRoman Chvanikov
2019-04-26mix: add bbcode dependencyWilliam Pitcock
2019-04-20Fix Credo warningsRoman Chvanikov
2019-04-20Digest emailsRoman Chvanikov
2019-04-17Resolve conflictsRoman Chvanikov
2019-04-16Bump ex_docrinpatch
2019-04-13Merge branch 'docs/changelog' into 'develop'Haelwenn
Add a changelog See merge request pleroma/pleroma!1053
2019-04-13Add a changelogrinpatch
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] Deps config adjustment (no `override` for `httpoison`), code analysis ↵Ivan Tashkinov
issues fixes.
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-28Move out of Gitlab Wikirinpatch
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just * Gets everything from gitlab wiki * Removes some specific gitlab hacks * Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-24Merge branch 'fix/eldap-warnings' into 'develop'rinpatch
Ignore compilation warnings for undefined module :eldap See merge request pleroma/pleroma!956
2019-03-20[#923] Support for multiple OAuth consumer strategies.Ivan Tashkinov
2019-03-20Ecto 3.0.5 migrationrinpatch
kms
2019-03-20Ignore compilation warnings for undefined module :eldaplink0ff
2019-03-18[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-15Fix headers and add !929 docs to extrasHaelwenn (lanodan) Monnier
[ci skip]
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-21mix: add timex dependencyWilliam Pitcock
2019-02-17Merge branch 'develop' into 'docs/add-clients-to-ex_doc'lambda
# Conflicts: # mix.exs
2019-02-17Fix formatingrinpatch
2019-02-17Add differences in MastoAPI responses to mix.exs extrasrinpatch
2019-02-16mix.exs: Add docs/Clients.md to docs.extrasHaelwenn (lanodan) Monnier
[ci skip]
2019-01-13Resolve merge conflictrinpatch
2019-01-06Install ex_sysloggerHaelwenn (lanodan) Monnier
2019-01-01Add OGP parserMaxim Filippov