1
0
Fork 0
Commit Graph

33970 Commits

Author SHA1 Message Date
Kaveh Vahedipour 317342ee2e XTERMOPTIONS not XTERM_OPTIONS 2016-09-30 08:50:32 +02:00
Kaveh Vahedipour 11a9d3bb87 local cluster start update 2016-09-29 16:10:45 +02:00
Kaveh Vahedipour 6eb80d6bce on the way to the all new local cluster 2016-09-29 16:05:53 +02:00
hkernbach f100a8c753 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 15:52:05 +02:00
hkernbach 226875acaf aql editor now handles queries running in the background 2016-09-29 15:51:56 +02:00
hkernbach 7281f2ad1a slightly higher timeout for notifications 2016-09-29 15:51:09 +02:00
Kaveh Vahedipour 93cb87e7e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-29 13:33:44 +00:00
Kaveh Vahedipour 9d55448507 oops useless assignement 2016-09-29 13:33:33 +00:00
Kaveh Vahedipour 1eedda332d arangod/Cluster/ClusterInfo.cpp 2016-09-29 15:32:10 +02:00
hkernbach 750b5625cc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 15:18:18 +02:00
hkernbach 5c45d09612 gv save settings bugfix 2016-09-29 15:18:03 +02:00
Alan Plum ee71ae01be
Add #2038 to changelog 2016-09-29 14:25:52 +02:00
Alan Plum fe4c4d166f
Handle multiple request body models 2016-09-29 14:16:42 +02:00
Kaveh Vahedipour 2816d1d328 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-29 14:07:45 +02:00
Kaveh Vahedipour cdffe12917 agency bug resolved 2016-09-29 14:07:31 +02:00
hkernbach 01004133f0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 14:03:34 +02:00
hkernbach c71a1fd5c9 color optimization query profiling 2016-09-29 14:03:26 +02:00
Michael Hackstein e92deea80f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 14:01:27 +02:00
Michael Hackstein af623854fa Fixed Smart graph injection of collections. 2016-09-29 14:01:18 +02:00
jsteemann ca102fc54f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-29 13:49:47 +02:00
jsteemann ebbd07a301 fix compile warning 2016-09-29 13:49:39 +02:00
hkernbach 466c24ce83 grunt build 2016-09-29 13:38:37 +02:00
hkernbach d18b17f938 semistandard 2016-09-29 13:38:33 +02:00
hkernbach c288e65a06 ui - cacheable explain 2016-09-29 13:34:58 +02:00
hkernbach 49b200aab4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 12:51:39 +02:00
hkernbach 0c68de3291 improved query ui 2016-09-29 12:51:25 +02:00
Kaveh Vahedipour 576bf27f45 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-29 12:02:48 +02:00
Kaveh Vahedipour 71087e9e82 fixed long waits on dropping shardless collections 2016-09-29 12:02:40 +02:00
Wilfried Goesgens dcbafac851 lintify 2016-09-29 11:38:35 +02:00
Max Neunhoeffer 4080f93eb2 Faster creation of smart edge collections. 2016-09-29 11:11:28 +02:00
Max Neunhoeffer 944b29c2a2 Make AQL aware of smart traversals for enterprise. 2016-09-29 11:02:57 +02:00
Max Neunhoeffer 449513049c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-29 10:58:59 +02:00
Max Neunhoeffer 154e3c86fc Add support in AQL for smart edge collections in traversals. 2016-09-29 10:57:49 +02:00
Wilfried Goesgens 78a06c387e force refresh of tags in enterprise working copy 2016-09-29 10:20:13 +02:00
Kaveh Vahedipour ef551f1b8b shell handles the smart graph parameters for collection creation 2016-09-29 10:11:49 +02:00
hkernbach 16d1d21e66 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 09:52:13 +02:00
hkernbach 965c790c35 ui slow connection bugfix, cleanup 2016-09-29 09:52:00 +02:00
Michael Hackstein 939159fc9f Updated the general-graph module to ignore SmartGraphs which are enterprise only. 2016-09-29 08:46:37 +02:00
Max Neunhoeffer 295ddba918 Fix output of _id attribute for new documents in smart edge collections. 2016-09-28 21:58:31 +02:00
Max Neunhoeffer a9436e5a83 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-28 21:07:49 +02:00
Max Neunhoeffer db021508da Fix virtual cloning of LogicalCollections and derived types. 2016-09-28 21:05:29 +02:00
Simran Brucherseifer f553d00376 Describe current format of document _key 2016-09-28 19:04:36 +02:00
Simran Brucherseifer 7366ef3982 Docs: adds links to AQL traversal for anonymous graphs 2016-09-28 19:04:36 +02:00
hkernbach 1fbd043893 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-28 16:47:39 +02:00
hkernbach bb9cc3b8fc small ui shard fix 2016-09-28 16:47:31 +02:00
Max Neunhoeffer dc706712b1 Silence a compiler warning in enterprise mode. 2016-09-28 16:23:58 +02:00
Max Neunhoeffer 4fb14d355d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-28 16:22:19 +02:00
Max Neunhoeffer 5f2eca61ab Remove isSmart attribute in community edition for Agency. 2016-09-28 16:21:09 +02:00
Max Neunhoeffer f4d9c30ee2 Improve an if statement. 2016-09-28 16:20:47 +02:00
hkernbach 1a32881bbb grunt build 2016-09-28 16:05:53 +02:00