aboutsummaryrefslogtreecommitdiff
path: root/mix.exs
AgeCommit message (Collapse)Author
2019-06-29Resolve conflictsRoman Chvanikov
2019-06-28Merge branch 'release/1.0' into 'develop'v1.0.0lain
1.0 Release See merge request pleroma/pleroma!1348
2019-06-28BUMP OF CHICKENlain
1.0
2019-06-22Merge branch 'develop' into release-docsrinpatch
2019-06-22Merge branch 'mix_sem_ver_version_fix' into 'develop'rinpatch
Fixed mix version computed for underscore-containing branches See merge request pleroma/pleroma!1314
2019-06-21mix: update bbcode dependency to v0.1.1William Pitcock
2019-06-21Fixed branch name substitutions for mix version (to comply to SemVer format).Ivan Tashkinov
2019-06-21Formattingrinpatch
2019-06-21Copy the nginx config to the release directoryrinpatch
2019-06-20Fixed mix version computed for underscore-containing branches to be of ↵Ivan Tashkinov
SemVer format.
2019-06-20Merge branch 'feature/release-update-script' into 'develop'rinpatch
pleroma_ctl: add an update command Closes #1004 and #988 See merge request pleroma/pleroma!1305
2019-06-19Make possible to override the branch name via a env variablerinpatch
This is useful for the CI builds because they have a detached HEAD or for emulating a feature that is availible only on a particular branch (e.g pleroma_ctl downloads CI artifacts only for develop and master)
2019-06-19aliases for mix tasksAlexander Strizhakov
ecto.migrate ecto.rollback
2019-06-19Refactor pleroma_ctl copying to a generic function for copying files into ↵rinpatch
the release dir
2019-06-18Deps: Update auto_linkerrinpatch
2019-06-16Merge branch 'fix/991-version-generation' into 'develop'rinpatch
version generation Closes #991 See merge request pleroma/pleroma!1291
2019-06-16no print version to the shellAlex S
2019-06-15Update Phoenix to 1.4.8Mark Felder
2019-06-15bugfixAlex S
2019-06-15little fixAlex S
2019-06-15version generationAlex S
2019-06-13Prometheus: Remove flaky process collection NIF.lain
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-11Add RateLimiterEgor Kislitsyn
2019-06-08Load ex_syslog and copy pleroma_ctlrinpatch
2019-06-05Fix conflictRoman Chvanikov
2019-06-04Mix: Swallow git error messages during version number handling.lain
Otherwise sometimes a 'fatal' message will be printed, confusing users.
2019-06-02Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit ↵Ivan Tashkinov
dependency specification.
2019-05-29Merge developRoman Chvanikov
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
Ssh fixes Closes #869 and #925 See merge request pleroma/pleroma!1191
2019-05-22Mix: Only start sshd when needed, second try.lain
2019-05-22Mix: Bring ecto-sql back to mainline.lain
2019-05-22Linting.lain
2019-05-22Mix: Don't start esshd application if we don't need it.lain
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-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