Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,454 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

18454 Commits

Author SHA1 Message Date
Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming 
Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)
 2014-12-03 14:48:04 +01:00
Thomas Schmidts ac4597b802 Fixed #1150. Added Queries to the Summary 2014-12-03 14:45:09 +01:00
Jan Steemann 6e75963843 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 13:49:16 +01:00
Jan Steemann 4f39b9e358 optimize away `INTO` of `COLLECT` if unused 2014-12-03 13:49:03 +01:00
Max Neunhoeffer 0c11d3815e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 13:30:55 +01:00
Max Neunhoeffer 7fd0260add Yet more printouts. 2014-12-03 13:30:43 +01:00
James efa0e51300 compiles 2014-12-03 11:54:40 +00:00
James 8c28127be1 fixing dynamic bounds which are lists. 2014-12-03 11:44:38 +00:00
Jan Steemann 29cd807fe6 fixed caps 2014-12-03 12:23:17 +01:00
Jan Steemann 8af441da56 Merge pull request #1148 from triAGENS/correct-horse-battery-staple 
Dev app baseUrls should be db-relative too
 2014-12-03 11:58:38 +01:00
Alan Plum 3b5b6b2249 Merge pull request #1151 from yojimbo87/devel 
GET /_api/collection/{collection-name} returns also 'isSystem' attribute
 2014-12-03 11:55:21 +01:00
Jan Steemann fc9ce8fb37 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 11:53:42 +01:00
Jan Steemann ae092f467f added derived file 2014-12-03 11:53:34 +01:00
Max Neunhoeffer 9a503ff8e5 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 11:47:34 +01:00
Max Neunhoeffer f5e5617155 One more cout. 2014-12-03 11:47:22 +01:00
Jan Steemann 9d197d3eb2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 11:39:04 +01:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Max Neunhoeffer 9a28d9914d Add new import tests to JS testsuite, fixing the "importing" target. 2014-12-03 11:27:44 +01:00
Tomas Bosak cf94fa4399 GET /_api/collection/{collection-name} returns also 'isSystem' attribute. 2014-12-03 11:24:52 +01:00
Max Neunhoeffer 4b099281aa Take some couts out to reproduce bug. 2014-12-03 11:17:23 +01:00
Max Neunhoeffer 8f1dd637c6 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 10:56:29 +01:00
Alan Plum 7a4076da8f Also accept `false` instead of an empty array. 2014-12-03 10:56:28 +01:00
Alan Plum 382747add9 Added example with no query params. 2014-12-03 10:49:16 +01:00
Jan Steemann ac13df1088 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 10:47:41 +01:00
Jan Steemann 8e2c5176f4 fixed segfault 2014-12-03 10:47:35 +01:00
Max Neunhoeffer d938a77531 Take out some couts to reproduce error. 2014-12-03 10:47:26 +01:00
Max Neunhoeffer 94e8bbe605 Fix error checking in unittests. 2014-12-03 10:45:51 +01:00
Alan Plum ef254963f0 Merge pull request #1149 from yojimbo87/devel 
Fix typo.
 2014-12-03 10:28:05 +01:00
Tomas Bosak 3d8764408f Fix typo. 2014-12-03 10:24:57 +01:00
Alan Plum 7b01edbb4c Fixes #1146. 2014-12-03 10:24:50 +01:00
Max Neunhoeffer f46d63cb5b Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 10:21:16 +01:00
Max Neunhoeffer 776ce77452 Fix a segfault in my couts. 2014-12-03 10:20:54 +01:00
Jan Steemann e81ac9993e fixed paragraph issue 2014-12-03 09:56:15 +01:00
Jan Steemann fa9ac4db44 fixed paragraph issue 2014-12-03 09:55:25 +01:00
Max Neunhoeffer 41785104d5 Even more couts. 2014-12-03 09:47:20 +01:00
Max Neunhoeffer 658256059f Yet more couts. 2014-12-03 09:44:22 +01:00
Max Neunhoeffer 41b01b78bc Even more couts. 2014-12-03 09:29:02 +01:00
Max Neunhoeffer 4125ffc5b1 Add some couts to finally debug SimpleHttpClient and shell-fm test. 2014-12-03 09:11:10 +01:00
Alan Plum 741bf1e4d5 Support positional arguments in Foxx queries. 2014-12-02 18:29:25 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Alan Plum 7d11a10226 Merge pull request #1128 from triAGENS/saner-repo-model 
Rename Repository#modelPrototype, add Repository#modelSchema
 2014-12-02 16:00:34 +01:00
James 99959d37dc more deleting 2014-12-02 13:29:15 +00:00
Alan Plum fdc4c1e810 Rename Repository#modelPrototype to avoid confusion. Added Repository#modelSchema. 2014-12-02 13:37:06 +01:00
James e3abbe0a17 added some comments 2014-12-02 12:35:08 +00:00
Alan Plum 0731d03e58 Merge pull request #1140 from stackmagic/args-for-transform 
Allow passing addition arguments to transforms in Foxx queries.
 2014-12-02 13:10:49 +01:00
James d02102450c Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-02 11:22:26 +00:00
James 52b174bb3d updating 2014-12-02 11:22:01 +00:00
Jan Steemann 14a130bb19 manual merge 2014-12-02 12:12:30 +01:00
Patrick Huber 46aeb0f54d fix errors pointed out by @pluma 2014-12-02 11:43:02 +01:00
James 0646a5a98e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	CHANGELOG
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
	js/server/tests/aql-optimizer-indexes.js
 2014-12-02 10:42:04 +00:00