Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: js/apps/system/aardvark/test/karma/karma.conf.js		2014-02-13 11:07:01 +01:00
..
arango	Fixed JSLint warnings, added JSLint to karma, will now be automatically checked. Wrapped all files in an anonymouse function and added usefull use strict	2013-11-12 16:09:40 +01:00
collections	Prepared databases, collections and shards for retrieval from foxx. No Fake data involved in these classes anymore. ToDo: Foxx routes	2014-01-20 17:57:08 +01:00
graphViewer	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
models	Functionality of the graph management implemented. CSS to go	2013-11-29 14:51:48 +01:00
planner	Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-12 16:08:31 +01:00
router	more tests fixed	2014-02-12 14:36:27 +01:00
views	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-13 11:07:01 +01:00