aboutsummaryrefslogtreecommitdiff
path: root/mix.lock
AgeCommit message (Collapse)Author
2019-07-20Merge developRoman Chvanikov
2019-07-18mix: update http signatures dependencyAriadne Conill
2019-07-17mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989Ariadne Conill
2019-07-16Use PleromaJobQueue for schedulingRoman Chvanikov
2019-07-16Merge developRoman Chvanikov
2019-07-15Dependencies: Update tzdata and related packages.lain
2019-07-12Update mix.lockRoman Chvanikov
2019-07-12merge developRoman Chvanikov
2019-07-10Update `gettext` dependencyEgor Kislitsyn
2019-07-10[#1062] added option to disable send emailMaksim
2019-07-10tests MRF filtersMaksim
2019-07-09Merge developRoman Chvanikov
2019-07-09reverse proxy testsAlexander Strizhakov
2019-06-29Resolve conflictsRoman Chvanikov
2019-06-21mix: update bbcode dependency to v0.1.1William Pitcock
2019-06-18Deps: Update auto_linkerrinpatch
2019-06-15Update Phoenix to 1.4.8Mark Felder
2019-06-12Update `auto_linker` dependencyEgor Kislitsyn
2019-06-11Merge branch 'feature/rate-limiter' into 'develop'lain
Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266
2019-06-11Update `plug` dependencyEgor Kislitsyn
2019-06-11Update `ex_rated` dependencyEgor Kislitsyn
2019-05-29Merge developRoman Chvanikov
2019-05-22Mix: Bring ecto-sql back to mainline.lain
2019-05-17Merge branch 'ecto_sql_update' into 'develop'lambda
Dependencies: Update Ecto SQL. See merge request pleroma/pleroma!1160
2019-05-17Dependencies: Update tzdata.lain
This fixes the bug that tz data could not be loaded. Closes #910.
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
ecto_sql_update
2019-05-17Dependencies: Update ecto sql once more.lain
2019-05-15Merge branch 'chore/extricate-http-signatures' into 'develop'lambda
switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155
2019-05-15Excoveralls for code coveragefeld
2019-05-15Dependencies: Update Ecto SQL.lain
2019-05-14switch to pleroma/http_signatures libraryWilliam Pitcock
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
[ci skip]
2019-05-11Merge developRoman Chvanikov
2019-05-11Initial bundle of basic AdminFEfeld
Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.
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-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
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-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