summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into baserock/danielsilverstone/...baserock/danielsilverstone/upgrade-gitano-fix-rsyncDaniel Silverstone2014-04-043-3/+20
|\
| * Support rsync directly to subdirectoriesDaniel Silverstone2014-04-041-2/+3
| * Cache expansionsDaniel Silverstone2014-03-221-0/+8
| * Allow tests to run even when not inside gitano-allDaniel Silverstone2014-03-141-1/+9
* | Merge in rsync support from upstream.Daniel Silverstone2014-03-1217-39/+288
|\ \ | |/
| * RSYNC: Update rsync plugin to fix hiccoughsDaniel Silverstone2014-03-121-5/+2
| * Merge in rsync work from CodethinkDaniel Silverstone2014-03-1117-39/+291
| |\
| | * Support for rsync in Trovesbaserock/danielsilverstone/S10634-rsync-supportDaniel Silverstone2014-03-112-1/+107
| | * Use new configurable repository detectionbaserock/danielsilverstone/S10633-repo-detectionDaniel Silverstone2014-03-113-31/+12
| | * Configurable repository detection for commandsDaniel Silverstone2014-03-111-2/+22
| | * Demonstration Pluginbaserock/danielsilverstone/S10632-plugin-supportDaniel Silverstone2014-03-111-0/+46
| | * Install plugins during `make install`Daniel Silverstone2014-03-111-1/+8
| | * Add plugin support to all `.in` filesDaniel Silverstone2014-03-118-0/+8
| | * Add support for a GITANO_PLUGIN_PATH in install-lua-binDaniel Silverstone2014-03-112-3/+19
| | * Plugin support in GitanoDaniel Silverstone2014-03-113-2/+67
| |/
* | Merge remote-tracking branch 'origin/master' into baserock/morphDaniel Silverstone2014-03-103-7/+10
|\ \ | |/
| * use passwd.method and passwd.hash insteadDaniel Silverstone2014-03-061-6/+6
| * Ignore generated CGIsDaniel Silverstone2014-03-061-0/+2
| * Mention lua-scrypt which will be mentioned on the websiteDaniel Silverstone2014-03-061-1/+2
| * Merge branch 'richardipsum/http' which contains the HTTP work from RichardDaniel Silverstone2014-03-0614-103/+756
| |\
| | * Fatal should write contents of LogBuf to stderrRichard Ipsum2014-03-061-1/+3
| | * Make gitano-setup ask whether we will use htpasswdRichard Ipsum2014-03-061-0/+2
| | * Can't close if we haven't a handleRichard Ipsum2014-03-061-2/+7
| | * Update rulesetRichard Ipsum2014-03-062-1/+4
* | | Merge branch 'baserock/richardipsum/http_v3' into baserock/morphRichard Ipsum2014-02-2016-125/+802
|\ \ \
| * | | Fatal should write contents of LogBuf to stderrbaserock/richardipsum/http_v3Richard Ipsum2014-02-181-1/+3
| * | | Make gitano-setup ask whether we will use htpasswdRichard Ipsum2014-02-181-0/+2
| * | | Can't close if we haven't a handleRichard Ipsum2014-02-181-2/+7
| * | | Update rulesetRichard Ipsum2014-02-182-1/+4
| * | | Update gitano.morphRichard Ipsum2014-02-181-0/+6
| | |/ | |/|
| * | Make Makefile install our new cgisRichard Ipsum2014-02-181-1/+2
| * | Add gitano-smart-http cgiRichard Ipsum2014-02-181-0/+76
| * | Add gitano-command cgiRichard Ipsum2014-02-181-0/+91
| * | Make Makefile install auth.luaRichard Ipsum2014-02-181-1/+1
| * | Add auth.luaRichard Ipsum2014-02-182-0/+142
| * | Fix some indentation in usercommandRichard Ipsum2014-02-151-22/+27
| * | Add htpasswd utilRichard Ipsum2014-02-151-0/+151
| * | Add passwd commandRichard Ipsum2014-02-151-3/+111
| * | Make whoami exit with err if user is anonymousRichard Ipsum2014-02-121-0/+5
| * | Add hash_password and check_password to utilRichard Ipsum2014-02-121-0/+14
| * | Fix some indentation in configRichard Ipsum2014-01-231-69/+70
| * | Don't use luxio.LOG_EMERG in syslogbaserock/richardipsum/log_emergRichard Ipsum2014-01-231-1/+1
| * | Add buffering capability to gitano.logRichard Ipsum2014-01-171-3/+50
| |/
| * Cope with nil back from sio:readDaniel Silverstone2013-11-171-1/+1
| * Merge branch 'master' of git://git.gitano.org.uk/gitanoDaniel Silverstone2013-11-151-0/+1
| |\
| | * Pass in pathsDaniel Silverstone2013-11-151-0/+1
| * | Expose project clod in the lace contextDaniel Silverstone2013-11-152-1/+31
| * | Fix up tabular matches to be less insaneDaniel Silverstone2013-11-151-12/+7
| |/
* | Merge branch 'master' into baserock/morphRichard Ipsum2013-10-0431-11/+811
|\ \ | |/
| * Also log the username and keytag in the syslog during gitano-authDaniel Silverstone2013-10-031-2/+4