summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Merge pull request #386 ... gpb-recompilation...detection""revert-413-undo-386-mergeFred Hebert2014-12-302-27/+106
* Merge pull request #413 from tomas-abrahamsson/undo-386-mergeFred Hebert2014-12-302-106/+27
|\
| * Revert "Merge pull request #386 from tomas-abrahamsson/gpb-recompilation-dete...Tomas Abrahamsson2014-12-232-106/+27
* | Merge pull request #411 from kittee/ct_appconfig_fixFred Hebert2014-12-228-6/+120
|\ \
| * | Fix app.config argument passing when using ct_run (take 2)Igor Savchuk2014-12-228-6/+120
|/ /
* | Merge branch 'irpab-fix_format_source'Fred Hebert2014-12-212-0/+3
|\ \ | |/ |/|
| * Merge branch 'fix_format_source' of https://github.com/irpab/rebar into irpab...Fred Hebert2014-12-212-0/+3
| |\ |/ /
| * deps: add new clause of format_source functionPavel Baturko2014-10-242-1/+4
* | Revert "Merge branch 'kittee-ct_appconfig_fix'"Fred Hebert2014-12-218-121/+6
* | Merge branch 'kittee-ct_appconfig_fix'Fred Hebert2014-12-218-6/+121
|\ \
| * \ Merge branch 'ct_appconfig_fix' of https://github.com/kittee/rebar into kitte...Fred Hebert2014-12-218-6/+121
| |\ \ |/ / /
| * | Fix app.config argument passing when using ct_runIgor Savchuk2014-11-288-7/+122
| |/
* | Merge pull request #408 from lrascao/fix/remove_duplicate_console_messageFred Hebert2014-12-211-1/+0
|\ \
| * | gpb_compiler: remove duplicate compiling messageLuis Rascao2014-12-211-1/+0
* | | Merge pull request #386 from tomas-abrahamsson/gpb-recompilation-detectionFred Hebert2014-12-212-27/+106
|\ \ \
| * | | Recompile .proto files with gpb also with prefix/suffixTomas Abrahamsson2014-11-052-27/+106
* | | | Merge pull request #406 from stwind/masterFred Hebert2014-12-214-2/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix deps path check in rebar_ct:collect_glob/3stwind2014-12-114-2/+11
* | | | Merge branch 'coolchevy-fix-dtl-target-path'Fred Hebert2014-12-161-4/+1
|\ \ \ \
| * | | | Remove no longer valid commentFred Hebert2014-12-161-2/+0
| * | | | Merge branch 'fix-dtl-target-path' of https://github.com/coolchevy/rebar into...Fred Hebert2014-12-161-2/+1
| |\ \ \ \ |/ / / / /
| * | | | fix target dir without subdir for erlydtl templatesVitalii Kulchevych2014-12-021-2/+1
* | | | | Merge pull request #405 from tuncer/erlgrindFred Hebert2014-12-162-3/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Generate cachegrind file if erlgrind is availableTuncer Ayaz2014-12-082-3/+26
|/ / / /
* | | | Merge pull request #404 from tuncer/consistent-export-attributesFred Hebert2014-12-044-9/+27
|\ \ \ \
| * | | | Consistently format export attributesTuncer Ayaz2014-12-035-10/+29
* | | | | Merge pull request #338 from vladdu/app_src_scriptFred Hebert2014-12-046-11/+147
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add tests for processing .app.src{.script} filesVlad Dumitrescu2014-12-034-0/+121
| * | | | Fix detection and processing of .app.src.scriptVlad Dumitrescu2014-12-032-9/+23
| * | | | Fix detection of .app.src.script (Reported-by: Vlad Dumitrescu)Tuncer Ayaz2014-12-021-2/+3
| |/ / /
* | | | Merge pull request #400 from vladdu/headersFred Hebert2014-12-0315-0/+30
|\ \ \ \
| * | | | add Emacs/vi header to non-dummy test modulesVlad Dumitrescu2014-12-0215-0/+30
| |/ / /
* | | | Merge pull request #403 from sdepold/patch-1Fred Hebert2014-12-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update reference to installation notesSascha Depold2014-12-031-1/+1
|/ / /
* | | Merge pull request #399 from tomas-abrahamsson/gpb-inttest-timeoutTristan Sloughter2014-12-011-0/+5
|\ \ \
| * | | Increase the timeout for the inttest/proto_gpbTomas Abrahamsson2014-12-011-0/+5
| |/ /
* | | Normalize log level as WARN to ERROR in new patchFred Hebert2014-11-272-3/+3
* | | Merge pull request #322 from tuncer/fix-319Fred Hebert2014-11-274-26/+165
|\ \ \
| * | | Treat vsn mismatch as warning if -k/--keep-goingTuncer Ayaz2014-11-254-26/+165
|/ / /
* | | Merge branch 'terrencehan-fix_upgrade_error'Fred Hebert2014-11-213-14/+52
|\ \ \
| * | | Additional fixes and modificationFred Hebert2014-11-212-8/+13
| * | | Merge branch 'fix_upgrade_error' of https://github.com/terrencehan/rebar into...Fred Hebert2014-11-213-9/+42
| |\ \ \ |/ / / /
| * | | Fix upgrade errorterrencehan2014-06-203-9/+42
* | | | Revert "Merge branch 'platinumthinker-color_in_logs'"Fred Hebert2014-11-214-67/+11
* | | | Merge branch 'platinumthinker-color_in_logs'Fred Hebert2014-11-214-11/+67
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'color_in_logs' of https://github.com/platinumthinker/rebar into...Fred Hebert2014-11-214-11/+67
| |\ \ \ |/ / / /
| * | | Fix verbose level in global rebar configAndrey Teplyashin2014-11-201-4/+12
| * | | Add colored logsAndrey Teplyashin2014-11-194-8/+56
* | | | Merge pull request #385 from tuncer/dialyzer-warningFred Hebert2014-11-031-6/+6
|\ \ \ \
| * | | | Fix Dialyzer warning introduced in 0caf047fTuncer Ayaz2014-11-031-6/+6
|/ / / /