summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
|/ / / / / /
* | | | | | Merge pull request #382 from tsloughter/upgrade_relxFred Hebert2015-05-031-2/+2
|\ \ \ \ \ \
| * | | | | | upgrade relx dep to latest mustache branch commitTristan Sloughter2015-05-031-2/+2
* | | | | | | Merge pull request #379 from tsloughter/rm_erlydtlFred Hebert2015-05-0128-475/+295
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | remove use of erlydtl in rebarTristan Sloughter2015-04-2928-475/+295
| | |_|_|/ | |/| | |
* | | | | Merge pull request #375 from tsloughter/kejv-support-parse-transformsFred Hebert2015-04-302-8/+52
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | enable parse transformations in rebar configTristan Sloughter2015-04-264-11/+55
| |/ / /
* | | | Merge pull request #378 from tsloughter/loading_registryFred Hebert2015-04-293-16/+25
|\ \ \ \ | |/ / / |/| | |
| * | | don't load package registry unless there are pkg deps to solveTristan Sloughter2015-04-283-16/+25
|/ / /
* | | Merge pull request #373 from tsloughter/checkouts_relFred Hebert2015-04-252-2/+4
|\ \ \
| * | | include _checkouts in release lib dirs if it existsTristan Sloughter2015-04-252-2/+4
|/ / /
* | | Merge pull request #371 from tsloughter/fetch_app_detailsTristan Sloughter2015-04-252-1/+23
|\ \ \
| * | | read in application details into app_info after fetchTristan Sloughter2015-04-242-1/+23
* | | | Merge pull request #372 from ferd/optimize-topsortingTristan Sloughter2015-04-251-16/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid topsorting deps twiceFred Hebert2015-04-251-16/+6
|/ / /
* | | Merge pull request #369 from tsloughter/noescriptFred Hebert2015-04-241-7/+25
|\ \ \
| * | | support templates even when not run as escriptTristan Sloughter2015-04-241-7/+25
* | | | Merge pull request #368 from ferd/fix-upgrade-promoteTristan Sloughter2015-04-232-13/+33
|\ \ \ \
| * | | | handle transitive deps being promotedFred Hebert2015-04-242-13/+33
* | | | | Merge pull request #367 from tsloughter/merge_locksFred Hebert2015-04-231-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge_locks crashed if a config didn't have a deps entryTristan Sloughter2015-04-231-1/+1
* | | | | Merge pull request #366 from tsloughter/no_header_warnFred Hebert2015-04-231-4/+0
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | remove warning if header not found, could be in a macroTristan Sloughter2015-04-231-4/+0
* | | | Merge pull request #365 from tsloughter/otp18Fred Hebert2015-04-235-10/+102
|\ \ \ \ | |/ / /
| * | | support for 18.0+Tristan Sloughter2015-04-235-9/+59
| * | | print and halt on compile errorTristan Sloughter2015-04-231-2/+44
|/ / /
* | | Merge pull request #363 from RJ/list-templatesFred Hebert2015-04-231-0/+3
|\ \ \
| * | | Re-add escript_incl_extra, for templatesRichard Jones2015-04-231-0/+3
|/ / /
* | | Merge pull request #358 from tsloughter/build_with_rebar3Fred Hebert2015-04-2325-163/+298
|\ \ \
| * | | update readme instructionsTristan Sloughter2015-04-221-1/+10
| * | | remove makefileTristan Sloughter2015-04-221-43/+0
| * | | update readme providerTristan Sloughter2015-04-221-1/+6
| * | | update readme bootstrap instructionsTristan Sloughter2015-04-221-5/+1
| * | | R15 support, replace unsetenv with putenv empty stringTristan Sloughter2015-04-223-2/+4
| * | | fix tracking of all profiles dep pathsTristan Sloughter2015-04-225-9/+53