summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #183 from ferd/hg-resourceTristan Sloughter2015-02-252-1/+123
|\ \ \ | |_|/ |/| |
| * | Support mercurial (hg) dependenciesFred Hebert2015-02-252-1/+123
* | | Merge pull request #185 from tsloughter/info_install_depsFred Hebert2015-02-251-35/+2
|\ \ \ | | |/ | |/|
| * | remove old info function from install_deps, it is a bare providerTristan Sloughter2015-02-251-35/+2
|/ /
* | Merge pull request #184 from ferd/fix-deps-unknown-srcTristan Sloughter2015-02-251-1/+1
|\ \ | |/ |/|
| * Fix crash on non-git source deps in deps providerFred Hebert2015-02-251-1/+1
|/
* Merge pull request #182 from tsloughter/profile_testsTristan Sloughter2015-02-243-6/+22
|\
| * profiles: combine lists of values for conflicting config optionsTristan Sloughter2015-02-243-6/+22
|/
* Merge pull request #180 from ferd/correct-vsnTristan Sloughter2015-02-231-1/+1
|\
| * We can use 3.0.0 when we're done.Fred Hebert2015-02-241-1/+1
|/
* Merge pull request #179 from ferd/upgrade-pkgFred Hebert2015-02-238-125/+69
|\
| * Revert accidental commited debug codeFred Hebert2015-02-241-2/+1
| * Add tests and fixes for packages upgradesFred Hebert2015-02-236-26/+49
| * Reuse test code and drop duplicated stuffFred Hebert2015-02-234-99/+21
|/
* Merge pull request #178 from rebar/merge-lock-fixTristan Sloughter2015-02-231-0/+5
|\
| * Fix lock merging for nonexistant lock files.Fred Hebert2015-02-231-0/+5
|/
* Merge pull request #174 from tsloughter/profile_testsFred Hebert2015-02-233-46/+128
|\
| * basic profile deps testsTristan Sloughter2015-02-223-46/+128
* | Merge pull request #177 from tsloughter/hook_outputFred Hebert2015-02-232-2/+3
|\ \
| * | output hook stdout and don't add extra newlineTristan Sloughter2015-02-232-2/+3
|/ /
* | Merge pull request #176 from talentdeficit/no_unescessary_yrl_xrl_recompileTristan Sloughter2015-02-232-6/+53
|\ \
| * | don't unescessarily recompile yrl/xrl filesalisdair sullivan2015-02-222-6/+53
|/ /
* | Merge pull request #173 from talentdeficit/empty_locks_fixTristan Sloughter2015-02-221-1/+1
|\ \ | |/ |/|
| * don't attempt to merge locks when there are no dependenciesalisdair sullivan2015-02-221-1/+1
|/
* Merge pull request #167 from tsloughter/release_testsFred Hebert2015-02-225-9/+94
|\
| * fix test, remove use of filelib:wildcard for R15 supportTristan Sloughter2015-02-221-2/+2
| * release and tar testsTristan Sloughter2015-02-225-9/+94
* | Merge pull request #169 from tsloughter/app_info_cleanupFred Hebert2015-02-228-200/+90
|\ \
| * | remove unneeded get_modules_list functionTristan Sloughter2015-02-221-17/+6
| * | consolidate app validation and exist checksTristan Sloughter2015-02-228-199/+100
|/ /
* | Merge pull request #171 from ferd/deps-refactoringTristan Sloughter2015-02-221-118/+131
|\ \
| * | Reindent multiline assignmentFred Hebert2015-02-221-11/+11
| * | Pass in newer state referenceFred Hebert2015-02-221-2/+1
| * | Refactor install depsFred Hebert2015-02-221-118/+132
* | | makefile template fixTristan Sloughter2015-02-211-1/+1
|/ /
* | Merge pull request #166 from tsloughter/xdgFred Hebert2015-02-2111-46/+54
|\ \
| * | fix order of top_level_deps function in ugprade_SUITETristan Sloughter2015-02-191-3/+3
| * | update templates doc for xdg config dir changesTristan Sloughter2015-02-191-5/+5
| * | follow xdg standard. fixes #122Tristan Sloughter2015-02-199-38/+46
* | | Merge pull request #168 from tsloughter/cmakeFred Hebert2015-02-212-0/+76
|\ \ \ | |_|/ |/| |
| * | cmake templateTristan Sloughter2015-02-212-0/+76
|/ /
* | Merge pull request #155 from tsloughter/new_depsFred Hebert2015-02-193-16/+77
|\ \
| * | check for newly added deps in config file that aren't level 0 in the lockTristan Sloughter2015-02-193-16/+77
| |/
* | Merge pull request #165 from tsloughter/project_app_infoFred Hebert2015-02-193-29/+32
|\ \ | |/ |/|
| * update project app list with new appinfo records after buildTristan Sloughter2015-02-193-29/+32
|/
* Merge pull request #160 from tsloughter/sub_depsFred Hebert2015-02-194-16/+63
|\
| * sort project apps before merging depsTristan Sloughter2015-02-193-13/+15
| * use project sub-apps with deps in their rebar.configTristan Sloughter2015-02-173-4/+49
* | Merge pull request #163 from talentdeficit/monitor_ctFred Hebert2015-02-181-2/+4
|\ \
| * | fix error where an exception in ct could hang rebar by monitoringalisdair sullivan2015-02-181-2/+4
|/ /