1
0
Fork 0
Commit Graph

7117 Commits

Author SHA1 Message Date
Michael Hackstein 027bda9ded Adjusted to new plan 2014-12-16 14:10:06 +01:00
Lucas Dohmen e484afc93c Remove parts of the Application View we don't need anymore 2014-12-16 14:10:06 +01:00
Michael Hackstein 6d2b664883 Started implementing the new modal dialog to install foxx apps 2014-12-16 14:10:05 +01:00
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +01:00
Jan Steemann 1a57d587e0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-16 00:25:42 +01:00
Jan Steemann 1c65c042a4 added tests, fixed exception 2014-12-16 00:20:40 +01:00
Jan Steemann bcdeabd3ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2014-12-15 21:53:51 +01:00
Jan Steemann 1ba3d65485 fixed tests 2014-12-15 21:06:43 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
James fd1c68fb4a more tests for sorting in descending order 2014-12-13 18:03:13 +00:00
James 17ed7fbef4 sorting works, tests updated 2014-12-13 17:47:59 +00:00
James 0dee54ee6f more bugfixes more tests 2014-12-13 16:05:20 +00:00
James a7635abe41 fixed some bugs added some tests 2014-12-13 14:51:46 +00:00
Jan Steemann e4686bcc1b reverted non-fix 2014-12-13 12:44:24 +01:00
Willi Goesgens b275c79793 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js
2014-12-13 00:20:09 +01:00
Willi Goesgens f3c13f7c38 Fix unittest. 2014-12-13 00:13:00 +01:00
Jan Steemann ff2ddd3133 fixed tests 2014-12-12 23:34:28 +01:00
Jan Steemann 44a5db257d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 23:02:42 +01:00
Jan Steemann f4d7a57c19 changed `COLLECT...INTO x COUNT` to `COLLECT...WITH COUNT INTO x`
allow executing subqueries without double brackets

jslint
2014-12-12 23:02:24 +01:00
Willi Goesgens daeb46893f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 21:40:35 +01:00
Willi Goesgens 115f226385 Optimizer: Enable removing of filternodes if the index can handle the filter condition. 2014-12-12 21:39:35 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
Heiko Kernbach c181bc7d9f issue: #1168 2014-12-12 11:05:26 +01:00
Heiko Kernbach e855e0faeb issue: #1161 fixed 2014-12-12 10:52:08 +01:00
Alan Plum 7cf115f321 Merge pull request #1176 from stackmagic/foxx-repo-any
repository.any()
2014-12-11 13:17:08 +01:00
Jan Steemann 9b15228676 fixed broken documentation 2014-12-11 12:30:41 +01:00
Patrick Huber 3692c23474 fixes from feedback 2014-12-10 22:05:06 +01:00
Lucas Dohmen a3a566bc87 Fix bug in the user app's storage 2014-12-10 15:14:43 +01:00
Patrick Huber d0eb69fc73 expose the any() method from the collection on the repository too 2014-12-10 14:19:06 +01:00
James 7ab57d64ec Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 22:05:57 +00:00
Jan Steemann 22928c1bb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
2014-12-09 22:45:55 +01:00
James 3ce7164fb6 finally working again, and more tests 2014-12-09 20:15:38 +00:00
Jan Steemann 959631c4d9 issue #1173: AQL Editor "Save current query" resets user password
Conflicts:
	CHANGELOG
2014-12-09 20:52:51 +01:00
Jan Steemann a86cf09f7f issue #1173: AQL Editor "Save current query" resets user password
Conflicts:
	CHANGELOG
2014-12-09 20:50:18 +01:00
Jan Steemann 5c9e52ea20 pass query parameters 2014-12-09 17:16:03 +01:00
Jan Steemann 1fdf74e09e jslint 2014-12-09 16:44:31 +01:00
Max Neunhoeffer 17f9c83540 Fix issue #1147, must encode dispatcher ID for etcd. 2014-12-09 16:32:37 +01:00
Max Neunhoeffer be421d926f Add new test for use-index-range rule and no rule explosion. 2014-12-09 15:40:22 +01:00
Jan Steemann a617dcffc5 added tests 2014-12-09 14:50:28 +01:00
James afb960f60e fixed another bug and added a test for it. 2014-12-09 11:19:34 +00:00
James a4dcf1b9d3 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 10:23:07 +00:00
James 8871612eb8 adding tests for last 2014-12-09 10:22:15 +00:00
Jan Steemann 797b6dbf75 added index tests 2014-12-09 11:01:58 +01:00
James 46fe461ca1 fixed bug and added test for it. 2014-12-09 09:40:40 +00:00
Jan Steemann 399e93c3ff issue #1155: allow bind parameter for sort order
SORT what @order is now allowed
2014-12-08 13:05:40 +01:00
Jan Steemann cd17c393ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
2014-12-08 12:37:13 +01:00
Jan Steemann d5ec9ca4bb jslint 2014-12-08 11:50:14 +01:00
Jan Steemann db507fe3f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:34:02 +01:00
Jan Steemann 63ceb0d1e0 added tests for mergeObjects 2014-12-08 11:33:54 +01:00
Max Neunhoeffer 10580f1401 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:30:21 +01:00