1
0
Fork 0
Commit Graph

43 Commits

Author SHA1 Message Date
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
Alan Plum a1896e6dd7 Rebuild aardvark 2015-12-01 19:53:34 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Jan Steemann b71d0fdcd4 rebuilt replication front end 2015-11-30 13:13:23 +01:00
Michael Hackstein 61f562eb4b Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-21 12:40:57 +01:00
hkernbach 4ecd633f31 grunt build 2015-11-20 21:27:46 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
hkernbach a574f6bdac grunt build 2015-11-17 13:58:51 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
hkernbach 3ae8eed4cb frontend grunt build 2015-11-06 20:23:22 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
hkernbach 699e2051c8 grunt build 2015-11-03 10:19:28 +01:00
hkernbach 8bba3a795a grunt build 2015-10-30 10:27:11 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
2015-10-28 11:08:18 +01:00
hkernbach a4bdf8d38c grunt build 2015-10-23 18:27:13 +02:00
Jan Steemann afc3de16ed re-grunted 2015-10-23 14:03:08 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann 4edc3d11f5 re-grunted 2015-10-21 13:07:30 +02:00
hkernbach 6005d3098e frontend cleanup & grunt build 2015-10-16 19:34:54 +02:00
hkernbach 0225c4d982 grunt cleanup & optimization 2015-10-16 13:47:03 +02:00
hkernbach 3f4e6cb982 grunt build 2015-10-14 00:42:30 +02:00
hkernbach 81df6ddda1 cleanup web interface 2015-10-14 00:36:05 +02:00
Jan Steemann e49064e5c4 hide `fm` variable in web interface shell 2015-10-09 15:25:56 +02:00
Jan Steemann e71dde08b7 added derived files 2015-10-09 14:28:02 +02:00
hkernbach 6cc0d4d184 new webui grunt build 2015-10-09 10:30:14 +02:00
hkernbach d066a4283c issue: #1446 2015-10-08 14:02:36 +02:00
Alan Plum ea44c7710c Rebuild aardvark 2015-10-06 16:35:00 +02:00
hkernbach db7533acf8 jslint fix 2015-10-02 10:23:08 +02:00
Jan Steemann 3ce21453c3 added derived files 2015-09-25 16:01:36 +02:00
Jan Steemann 71f8d89eeb allow installing Foxx applications in /_open/ 2015-09-24 15:59:42 +02:00
hkernbach 1b8e6ddfec renamed a graph viewer label 2015-09-22 15:58:31 +02:00
hkernbach 9e79c27b64 finalized issue #1433 2015-09-22 15:22:51 +02:00
hkernbach 108b873b28 graphViewer css 2015-09-22 15:00:58 +02:00
hkernbach 285a404d8e fixed issue #1499, added possibility to change graph vertex number 2015-09-22 14:55:52 +02:00
hkernbach 63a23f81bc web ui navigation dropdown issue 2015-09-22 13:40:00 +02:00
hkernbach d1fe228e8f issue: #1487 2015-09-22 13:31:25 +02:00
hkernbach 5946452201 css, issue: #1488 2015-09-22 11:26:42 +02:00
hkernbach 604458b4b3 fixed issue: #1486 2015-09-22 11:03:49 +02:00
hkernbach b8a5e56cb7 fixed issue #1494, fixed some grunt processing 2015-09-22 10:27:04 +02:00
hkernbach 3643159055 added es6 to es5 conversion for some modules, fixed issue #1485 2015-09-22 09:28:46 +02:00
Michael Hackstein 1a7f414c16 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-09-18 12:21:39 +02:00
Frank Celler c4d1fff729 new traversal 2015-09-18 10:40:28 +02:00
Jan Steemann 2419ec939b re-added build directory 2015-09-14 10:52:21 +02:00