summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #393 from tsloughter/no_debug_infoFred Hebert2015-05-081-4/+4
|\
| * include debug_info when running tests of rebar3Tristan Sloughter2015-05-071-3/+3
| * no_debug_info brings down size of escript from 757K to 549KTristan Sloughter2015-05-051-1/+1
* | Merge pull request #396 from tsloughter/masterFred Hebert2015-05-081-3/+3
|\ \
| * | switch to soranoba's mustache repoTristan Sloughter2015-05-081-3/+3
* | | Merge pull request #400 from tsloughter/ingwinlu-fix_windows_bootstrapTristan Sloughter2015-05-087-314/+137
|\ \ \
| * | | don't use rebar_dir function in bootstrapTristan Sloughter2015-05-071-1/+10
| * | | Merge branch 'fix_windows_bootstrap' of https://github.com/ingwinlu/rebar3 in...Tristan Sloughter2015-05-0710-59/+247
| |\ \ \ | | |/ / | |/| |
| | * | fix rebar_git_resourcederwinlu2015-05-072-15/+23
| | * | fix bootstrap on windows, fallback to copy if symlinking failsderwinlu2015-05-071-1/+95
| |/ / |/| |
* | | Merge pull request #380 from waisbrot/shell-configTristan Sloughter2015-05-071-1/+61
|\ \ \
| * | | try to read a config file when running `rebar shell`Nathaniel Waisbrot2015-05-071-1/+61
* | | | Merge pull request #394 from umbec/masterFred Hebert2015-05-062-4/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Manage syntax error in app.src files.Umberto Corponi2015-05-062-4/+17
|/ / /
* | | Merge pull request #392 from tsloughter/mustache2Fred Hebert2015-05-052-225/+287
|\ \ \
* \ \ \ Merge pull request #390 from tsloughter/mustache_bugFred Hebert2015-05-051-1/+1
|\ \ \ \
* | | | | Bump to alpha-5Fred Hebert2015-05-052-2/+3
* | | | | Merge pull request #388 from ferd/fix-semver-stuffTristan Sloughter2015-05-045-51/+73
|\ \ \ \ \
| * | | | | Use resource handlers to deal with deps/semverFred Hebert2015-05-053-36/+48
* | | | | | Merge pull request #387 from tsloughter/missing_pkgFred Hebert2015-05-044-14/+18
|\ \ \ \ \ \
| | | | | | * update mustache for r15 supportTristan Sloughter2015-05-061-1/+1
| | | | | | * use mustache as a depTristan Sloughter2015-05-064-298/+10
| | | | | |/ | | | | |/|
| | | | * | fix integer to binary conversion for pre17 releasesTristan Sloughter2015-05-051-1/+1
| | | | * | fix types for pre-17 releasesTristan Sloughter2015-05-051-0/+4
| | | | * | add licenseTristan Sloughter2015-05-051-2/+14
| | | | * | switch mustache imlementation to https://github.com/soranoba/mustacheTristan Sloughter2015-05-052-231/+277
| | | |/ /
| | | * | fix }}} bug in mustacheTristan Sloughter2015-05-051-1/+1
| | |/ /
| | * | set resources to empty list if non in app envTristan Sloughter2015-05-041-1/+6
| | * | set resources of state in state initialize functionsTristan Sloughter2015-05-042-15/+20
| |/ /
| * | handle missing package in registry by skippingTristan Sloughter2015-05-044-14/+18
|/ /
* | Merge pull request #384 from ferd/rework-deps-providerTristan Sloughter2015-05-041-48/+45
|\ \
| * | Fix dupes in deps provider, support atom pkgsFred Hebert2015-05-041-48/+45
* | | Merge pull request #383 from ferd/kovyl2404-app-discover-profile-duplicationFred Hebert2015-05-043-9/+171
|\ \ \
| * | | Adding directory path test for deduplicationFred Hebert2015-05-041-0/+18
| * | | Merge branch 'app-discover-profile-duplication' of https://github.com/kovyl24...Fred Hebert2015-05-043-9/+153
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into app-discover-profile-duplicationViacheslav V. Kovalev2015-05-0149-370/+1022
| | |\ \
| | * | | Revert accidentially changed formattingViacheslav V. Kovalev2015-04-223-4/+4
| | * | | Merge remote-tracking branch 'my/app-discover-profile-duplication' into app-d...Viacheslav V. Kovalev2015-04-223-30/+8
| | |\ \ \
| | | * | | Get rid of rebar_utils:tup_umerge/2 patchingViacheslav Kovalev2015-04-223-30/+8
| | * | | | Merge branch 'app-discover-profile-duplication' of https://github.com/kovyl24...Viacheslav V. Kovalev2015-04-224-5/+96
| | |\ \ \ \ | | | |/ / /
| | | * | | Implement opts umerge deduplicationViacheslav Kovalev2015-04-224-24/+69
| | | * | | Implement some test on profiles deduplicationViacheslav V. Kovalev2015-04-222-2/+113
| | * | | | Implement some test on profiles deduplicationViacheslav V. Kovalev2015-04-211-0/+65
| | |/ / /
| | * | | Correctly deduplicate profiles when applyingViacheslav V. Kovalev2015-04-212-12/+19
| | * | | Do not duplicate profile when applying.Viacheslav V. Kovalev2015-04-191-1/+5
* | | | | Merge pull request #386 from tsloughter/relx_templatesFred Hebert2015-05-041-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | include relx templates in escriptTristan Sloughter2015-05-041-1/+3
* | | | | Merge pull request #381 from tsloughter/upgrade_branchFred Hebert2015-05-034-11/+9
|\ \ \ \ \ | |/ / / /
| * | | | only fetch branch needed, remove rebar_vsn_plugins from erlware_commonsTristan Sloughter2015-05-033-7/+3
| * | | | on upgrade of git branch check against remoteTristan Sloughter2015-05-032-5/+7
|/ / / /