1
0
Fork 0
Commit Graph

16 Commits

Author SHA1 Message Date
Jan Steemann 8f27ef531c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	scripts/run
2014-09-15 09:51:04 +02:00
Alan Plum c34ff6130b Updated AQB. 2014-09-14 16:39:10 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
2014-09-09 22:18:52 +02:00
Alan Plum dfe193b1a4 Updated AQB. 2014-09-09 13:18:31 +02:00
Willi Goesgens 31adea628c Add YAML Parser/Dumper 2014-09-08 09:48:05 +02:00
Alan Plum 8b1f955bb0 Added AQB to deps. 2014-09-03 11:27:37 +02:00
Alan Plum b665e038be Switched jslint to jshint. Broke everything. 2014-09-02 22:10:24 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Alan Plum fbe136b5c1 Added joi. 2014-07-08 14:15:03 +02:00
Frank Celler 678d126f43 cleanup of modules 2014-06-28 14:03:58 +02:00
Frank Celler b395ecc15b changed eol 2014-06-06 15:11:49 +02:00
Frank Celler 443cc769ac updated node modules 2014-05-29 10:03:18 +02:00
Frank Celler 00490ef26d removed unnessary files 2014-02-20 20:02:00 +01:00
Frank Celler 16f7d558ba added node modules semver, numeral, moment, marked 2014-02-13 15:31:48 +01:00
Frank Celler 5b7eb66c9d added iced coffee script 2014-02-11 14:49:01 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00