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

7448 Commits

Author SHA1 Message Date
Willi Goesgens 3a1a0b5c29 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-14 17:20:27 +01:00
Willi Goesgens c641b2214b - Use a predefined array to differenciate between informational & payload members of the testresults structure. 
- Only report failure if we occur extraordinary server vanishes.
 2015-01-14 17:19:02 +01:00
Jan Steemann 69a698ed7c fix wording 2015-01-14 17:08:10 +01:00
Jan Steemann 5abfeca10c fixed invalid result for fm.rescan() 2015-01-14 17:07:29 +01:00
Willi Goesgens 1fca272389 Move tests to timecritical which seem to fail on a regular basis. 2015-01-14 14:55:23 +01:00
Willi Goesgens 58e1d0b1fe Expand grace period a little more, maybe valgrind can catch up then. 2015-01-14 09:33:02 +01:00
Willi Goesgens cf2abccde8 Fix output of empty xml files if there was a skipped test 
- return the propper message if the test is skipped
  - evaluate skipped in the xml dumper
  - ignore status fields in the structure as test results for xmls
 2015-01-13 19:05:48 +01:00
Alan Plum c651ca1f82 Lock ramda version. 2015-01-13 18:44:38 +01:00
Alan Plum 8e538c4a1d Updated AQB to 1.8.0. 2015-01-13 18:23:28 +01:00
Alan Plum bab4c8310f Updated AQB to 1.7.0. 2015-01-13 17:54:24 +01:00
Jan Steemann 1e7a5218db fixed inability to create collections from the web ui 2015-01-13 17:11:36 +01:00
Alan Plum 1db51dcf1a Linting. 2015-01-13 13:56:51 +01:00
Alan Plum b0517096f3 Updated aqb to 1.6.0. 2015-01-13 13:55:37 +01:00
Lucas Dohmen 6999a6e3e4 Merge pull request #1204 from triAGENS/foxxy-bodies-of-joi 
Allow bodyParam to take joi schemas and actually validate data
 2015-01-13 13:46:37 +01:00
Michael Hackstein ff30d50c93 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-13 13:20:07 +01:00
Michael Hackstein aaf8d70a83 Improved a generated general graph AQL. It now does not compute the complete set of vertices before filtering, instead it merges the examples before computing. 2015-01-13 13:19:56 +01:00
Alan Plum 2803e090c0 Merge pull request #1188 from triAGENS/windows-line-endings-in-foxx 
Fix Foxx JSDoc for Windows Line Endings
 2015-01-13 13:18:00 +01:00
Willi Goesgens dd55ce2dd2 Good news first: output failing tests at the end of the report, so scrolling up isn't neccessary 2015-01-13 13:03:10 +01:00
Willi Goesgens 2e1d52c1f2 Wait longer for collections to unload before failing. 2015-01-13 10:57:11 +01:00
Willi Goesgens 7c5a003dd0 Wait 30s for successfull start of arangod 2015-01-13 10:31:39 +01:00
Jan Steemann f9cfbbee4e type-safe comparisons 2015-01-13 01:31:39 +01:00
Jan Steemann c94664b4cd whitespace 2015-01-12 20:23:27 +01:00
Jan Steemann 906d22a691 make fs.move() behave identical on Linux and Windows 
Conflicts:
	CHANGELOG
 2015-01-12 20:13:11 +01:00
Willi Goesgens b061aabda6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-12 19:29:12 +01:00
Willi Goesgens 497b5c31bd - if the server fails to start, don't loop endless waiting for it to come up 
- on windows call rspec.bat ('caus it suxx)
 2015-01-12 19:28:18 +01:00
Jan Steemann 2af987ed66 added tests 2015-01-12 15:25:45 +01:00
Jan Steemann 2cbc278e6c finally 2015-01-12 14:23:26 +01:00
Jan Steemann 591a92fa0d jslint 2015-01-12 12:02:05 +01:00
Jan Steemann d02de8d7e0 more tests 2015-01-12 11:59:19 +01:00
Max Neunhoeffer 207aba0983 Sensible state 2 for aql-modify-cluster.js. 2015-01-12 10:49:32 +01:00
Max Neunhoeffer 3e27c46bf4 Sensible state for aql-modify-cluster.js 2015-01-12 10:49:07 +01:00
Max Neunhoeffer 743d92f466 Use multiple shards in cluster modifying AQL queries. 2015-01-12 10:37:28 +01:00
Jan Steemann acb02ad257 jslint 2015-01-09 19:51:58 +01:00
Michael Hackstein 8b1bf3b90e Style fixes for application view 2015-01-09 16:40:04 +01:00
Michael Hackstein 53aa7a6950 Improvements on the new Application Tab. It is now possible to filter all Apps by their type. It is also possible to install user mountable system apps via the App store 2015-01-09 16:40:03 +01:00
Michael Hackstein e813caaef8 Added more style to arango-store 2015-01-09 16:40:03 +01:00
Jan Steemann 7961be8836 fixed test 2015-01-09 10:39:05 +01:00
Jan Steemann ba30df4e5c added test 2015-01-09 00:03:50 +01:00
Jan Steemann 26b51b35b8 added tests 2015-01-08 17:31:40 +01:00
Jan Steemann f2590881f1 return old or new values in data-modification operations 2015-01-08 16:35:54 +01:00
Michael Hackstein bab3f9b467 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-08 10:47:30 +01:00
Michael Hackstein 909fdcb68e More sophisticated errors during launch time of Foxx apps now available. 2015-01-08 10:47:12 +01:00
Thomas Schmidts 13072f1345 Merge pull request #1194 from yojimbo87/devel 
Add missing return codes to API docs.
 2015-01-08 09:38:44 +01:00
Willi Goesgens 0fa352b699 comment out curerntly failing test. 2015-01-07 16:32:09 +01:00
Willi Goesgens e2f206fd2c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/grammar.cpp
 2015-01-07 15:50:44 +01:00
Willi Goesgens f905123802 Implement REMOVE/INSERT/UPDATE/REPLACE return the changed values 2015-01-07 15:48:13 +01:00
Jan Steemann 1e3082aef3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-07 15:11:57 +01:00
Jan Steemann c591357dd3 slightly changed cost estimation for IndexRangeNode 2015-01-07 15:11:42 +01:00
Frank Celler 26d11822ab made path relative in order to avoid problems when using a different port 2015-01-07 13:43:39 +01:00
Frank Celler 49cb009186 fixed validation rules 2015-01-07 13:28:53 +01:00
Alan Plum 6b4443ca74 Added longhand joi example. 2015-01-07 11:23:25 +01:00
Alan Plum 75cf182de2 Allow RequestContext#bodyParam to take joi schemas and reject invalid data. 2015-01-07 11:21:19 +01:00
Alan Plum 6fde5c96a8 Tests should not use deprecated Foxx features. 2015-01-07 11:02:42 +01:00
Alan Plum 6fad459fcc Removed Foxx Model legacy tests (non-joi schemas are no longer supported in 2.5+). 2015-01-07 10:52:09 +01:00
Alan Plum a41ccfa835 Fixed hilarious bug (sorry). 2015-01-07 10:52:09 +01:00
Alan Plum a31b54a712 Improved Foxx docs. 2015-01-06 23:03:08 +01:00
Alan Plum 864c19b64e Adjust toJSONSchema to better cope with joi schemas. 2015-01-06 22:41:33 +01:00
Alan Plum 2b569e5db2 Ported legacy Foxx syntax to 2.4+. 2015-01-06 20:37:18 +01:00
Alan Plum 7aee5e56bd Extract toJSONSchema from Model. 2015-01-06 20:37:10 +01:00
Alan Plum 7ec9a31895 Post-2.4: removed deprecated Foxx features for 2.5. 2015-01-06 17:34:59 +01:00
Alan Plum 028d204596 Deprecation warnings for 2.4. 2015-01-06 17:25:55 +01:00
Jan Steemann b82b4deb6a fixed comment 2015-01-05 11:38:33 +01:00
Jan Steemann d2520f6fa3 fixed comment 2015-01-05 11:38:24 +01:00
Jan Steemann 971ead19cb added tests 2015-01-05 09:42:31 +01:00
Jan Steemann e76e649b27 added derived file 2015-01-05 09:42:24 +01:00
Jan Steemann ac0bb85c3d issue #1201: better error checking for fulltext index with multiple attributes 2015-01-05 09:41:56 +01:00
Frank Celler bbf239e762 fixed end-of-tutorial 2015-01-04 22:04:46 +01:00
Frank Celler 06660a6a68 ignore errors in jshintrc 2015-01-04 22:04:45 +01:00
Jan Steemann f3b142849f fixed leaks during reverts 2015-01-03 01:28:23 +01:00
Jan Steemann 58edf3fee7 comments 2015-01-02 20:00:08 +01:00
Jan Steemann 8aa1748f8b updated aqb 2015-01-02 16:01:10 +01:00
Jan Steemann cc0a4cdb4f issue #1200: fixed short-circuiting of [*] operator 
Conflicts:
	arangod/Aql/grammar.cpp

Conflicts:
	arangod/Aql/grammar.cpp
 2015-01-02 13:49:51 +01:00
Max Neunhoeffer 27b66a7561 Adjust tests, since now more DistributeNodes are used. 2014-12-24 06:58:02 +01:00
Max Neunhoeffer af976491b2 Fix tests finally. 2014-12-24 00:26:20 +01:00
Max Neunhoeffer 354825d12d Fix a test because now more queries use DistributeNode. 2014-12-24 00:19:20 +01:00
Alan Plum 7cf6f4954f Updated AQB to 1.5. 2014-12-23 21:34:11 +01:00
Max Neunhoeffer 9e7342c257 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-23 16:52:50 +01:00
Max Neunhoeffer 1cdf439845 Broken version, errors not yet fixed. 2014-12-23 16:51:48 +01:00
Heiko Kernbach 4ea60b80f0 jslint 2014-12-23 11:03:58 +01:00
Heiko Kernbach 3c0249a580 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-23 11:00:16 +01:00
Heiko Kernbach 09d14c1be4 #1065 - added option to add a key for a new document or edge 2014-12-23 11:00:08 +01:00
Heiko Kernbach bf076c8255 #1198 - added caching for user defined queries 2014-12-23 09:47:50 +01:00
Jan Steemann cc9a26c268 indicate at least some errors for failing uploads 2014-12-22 17:21:33 +01:00
Jan Steemann b1150e7177 improve error message in case no suitable index is present for range query 2014-12-22 16:19:40 +01:00
Jan Steemann 406bd99800 added derived file 2014-12-22 16:15:16 +01:00
Jan Steemann 67aa5b67e5 ES6 2014-12-22 12:56:57 +01:00
Jan Steemann cded2892ef ES6 2014-12-21 19:12:16 +01:00
Jan Steemann 6d6d67f06f activated optimizer rule remove-sort-rand 
fixed tests, updated documentation
 2014-12-21 18:50:50 +01:00
Michael Hackstein 962dec57f2 The web interface now does not fail anymore if it cannot connect to github.com. Appropriate information is generated. 2014-12-20 22:40:05 +01:00
Jan Steemann 69e4665bf5 ES6 2014-12-20 21:57:30 +01:00
Jan Steemann b4454fa91a jslint 2014-12-20 21:56:42 +01:00
Jan Steemann d358b80080 ES6 2014-12-20 04:02:24 +01:00
Michael Hackstein b076e92559 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-19 18:41:04 +01:00
Michael Hackstein c936105b04 Fixed validation of input in ModalViews. Added validation to new app tab. 2014-12-19 18:40:50 +01:00
Michael Hackstein 5a417fa209 Modal View now checks if all entries are valid before reactivating the success button 2014-12-19 17:40:28 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Michael Hackstein abfe71e8ce Style fixes for Application Tab. View as well as install dialog 2014-12-19 13:09:07 +01:00
Michael Hackstein 70354aee35 Replaced the AppStore with ArangoDB Store. Some minor style fixes 2014-12-19 10:49:07 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Willi Goesgens 537e56a5c2 - Remove remaints of ahuacatl 
- flip status to the front for more easy alignment & better reading
 - add single_localserver for local execution in one instance.
 2014-12-18 17:18:49 +01:00
Jan Steemann d499a8fb8f fixed test results 2014-12-18 10:43:11 +01:00
Jan Steemann 2ab3aa998d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-17 14:21:37 +01:00
Jan Steemann 363df745ea fix program names 2014-12-17 14:19:54 +01:00
Willi Goesgens d46b215e30 Expect Indexrangenodes where we now know they will be created. 2014-12-17 14:01:50 +01:00
Willi Goesgens 016c8e477b Remove debug prints 2014-12-17 13:32:34 +01:00
Willi Goesgens ed2529efe9 We can now convert EnumerateCollectionNodes to IndexRangeNodes here too. 2014-12-17 13:05:44 +01:00
Lucas Dohmen 58e52e6a0c Merge pull request #1193 from stackmagic/foxx-repo-doc 
mention 'byId' supports not only ids but also keys (from #1181)
 2014-12-17 10:35:20 +01:00
Willi Goesgens 419e3ece51 Make jslint happy. 2014-12-17 09:22:22 +01:00
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Michael Hackstein e24ad86ba0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/applicationsView.js
 2014-12-16 17:06:49 +01:00
Michael Hackstein d9156bc921 Changed hardcoded error num in web interface to generated error object 2014-12-16 17:03:55 +01:00
Frank Celler 40e4b40dff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 16:28:30 +01:00
Jan Steemann 61f799ecf0 satisfy jslint 2014-12-16 15:37:15 +01:00
Jan Steemann a8ad216a0a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 15:25:53 +01:00
Jan Steemann 571b6b5b02 added tests 2014-12-16 15:25:46 +01:00
Michael Hackstein d8ad93f1b6 Moved fishbowl update from client to common module of foxx manager. Offered update in server-side foxx manager and used it in Web Interface 2014-12-16 14:10:15 +01:00
Michael Hackstein 3fdffe3367 Added view templates for generated Foxx apps 2014-12-16 14:10:15 +01:00
Michael Hackstein 275503224e Added some Error notification for Foxx App install failures. Added download for Zipfile as well as information for your development path. 2014-12-16 14:10:15 +01:00
Michael Hackstein 520541fa7e Added styling for disabled buttons and the drag and drop upload dialog 2014-12-16 14:10:14 +01:00
Michael Hackstein 6bb51ab851 Added templates for setup and teardown. Added a model for the configuration 2014-12-16 14:10:14 +01:00
Michael Hackstein 88e304fce0 Added a drag & drop upload zip field. Added explaination texts for zip and github 2014-12-16 14:10:14 +01:00
Michael Hackstein 2c026cecb4 Fixed a forgotten todo variable name 2014-12-16 14:10:14 +01:00
Michael Hackstein 85da13197d Added an automatic dev app reloading. 2014-12-16 14:10:14 +01:00
Michael Hackstein 987dec185e Created code for setup and teardown. Also dev setup will be executed in development mode. 2014-12-16 14:10:13 +01:00
Michael Hackstein dc15329e64 Improved the optics of the Apllication install View. Also now shows Devel as version number for dev apps. 2014-12-16 14:10:13 +01:00
Lucas Dohmen d3987063a5 Bugfixing 2014-12-16 14:10:13 +01:00
Lucas Dohmen 51f3c853ad Build Manifest correctly 2014-12-16 14:10:13 +01:00
Lucas Dohmen 597e61b928 Generate controllers 2014-12-16 14:10:13 +01:00
Michael Hackstein 4f4b4c59da The web interface now sends information to fill the templates for generating an app 2014-12-16 14:10:13 +01:00
Lucas Dohmen 5e41c1798a Create folder structure, models and repositories 2014-12-16 14:10:12 +01:00
Michael Hackstein ca99f19d7d First draft of a create my own app template generator 2014-12-16 14:10:12 +01:00
Lucas Dohmen 0ad5395d53 Add paths to the manifest 2014-12-16 14:10:12 +01:00
Lucas Dohmen 7f20de5f41 Template Engine refactored 2014-12-16 14:10:12 +01:00
Michael Hackstein 13d0ff1169 Added the most complicated and non documented pluralizer npm module we ever found in Lucas life 2014-12-16 14:10:12 +01:00
Michael Hackstein ac6dee8011 Fixed attribute/s bug 2014-12-16 14:10:12 +01:00
Lucas Dohmen 93f520b723 First steps towards generating a Foxx app 2014-12-16 14:10:12 +01:00
Lucas Dohmen 8914c18561 applicationDetailView 2014-12-16 14:10:11 +01:00
Michael Hackstein 586382c010 The FoxxManager now updates before delivering the fishbowl list to the WebInterface 2014-12-16 14:10:11 +01:00
Lucas Dohmen 53ec81a101 Enable button if the app is neither devel nor system 2014-12-16 14:10:11 +01:00
Lucas Dohmen 0c5ca609da Delete Apps 2014-12-16 14:10:11 +01:00
Lucas Dohmen c0b6e801b1 Show link to download documentation for all non-development apps 2014-12-16 14:10:11 +01:00
Lucas Dohmen 8c08e6c8c6 Select menu item for applicationDetailView 2014-12-16 14:10:10 +01:00
Lucas Dohmen 6e6069a9bf Add Repository info to all system apps 2014-12-16 14:10:10 +01:00
Lucas Dohmen 2db72f990c Show Git Repositories 2014-12-16 14:10:10 +01:00
Lucas Dohmen e9153b0dbf Show Mountpath in title of application 2014-12-16 14:10:10 +01:00
Lucas Dohmen e34448f2a2 Add repository and license to both development and normal mode 2014-12-16 14:10:10 +01:00
Lucas Dohmen a0a04ade13 Rescue the case of missing contributors and authors 2014-12-16 14:10:10 +01:00
Michael Hackstein 7f74892480 Added a template for the fishbowl list of apps 2014-12-16 14:10:09 +01:00
Michael Hackstein 5e6e8caeaa Added proof of concept implementation of Foxx App template generator 2014-12-16 14:10:09 +01:00
Michael Hackstein 3ab1fcf4b6 Allows to install apps from fishbowl in web interface. 2014-12-16 14:10:09 +01:00
Michael Hackstein 38564a1709 Sorted list from fishbowl 2014-12-16 14:10:09 +01:00
Lucas Dohmen 303e4e6d94 Only one applicationDetailView 2014-12-16 14:10:09 +01:00
Lucas Dohmen cb5374e293 Disable open button when there's nothing to open 2014-12-16 14:10:09 +01:00
Lucas Dohmen 3154c1ae1b Open an app 2014-12-16 14:10:09 +01:00
Lucas Dohmen 03a827cf12 Design for applicationDetailView 
* Open and Delete App Buttons Fake implementation
* Breadcrumb for applicationDetailView
 2014-12-16 14:10:08 +01:00
Michael Hackstein c62cfb31cd Now shows all apps from appstore 2014-12-16 14:10:08 +01:00
Michael Hackstein 4363ae15be Implemented multiple repeated indentical zip file uploads 2014-12-16 14:10:08 +01:00
Lucas Dohmen 04ad61967b Starting design of applicationDetailView 2014-12-16 14:10:08 +01:00
Lucas Dohmen d0000ec0cb Add Documentation to the Foxx Detail View 2014-12-16 14:10:08 +01:00
Lucas Dohmen 392b6a6b1e Remove removed file from manifest 2014-12-16 14:10:08 +01:00
Lucas Dohmen ab0885f0ef Show License and Version for each of the apps 2014-12-16 14:10:07 +01:00
Lucas Dohmen 3b1c5b640e Show contributors 2014-12-16 14:10:07 +01:00
Lucas Dohmen ac93dc5dce Save contributors for mounted apps 2014-12-16 14:10:07 +01:00
Lucas Dohmen 9726aebeba Adjusted authors and contributors for all system apps 2014-12-16 14:10:07 +01:00
Lucas Dohmen 14bc13bee6 Collect information for the applicationDetailView 2014-12-16 14:10:07 +01:00
Lucas Dohmen 552014bf2f Application View skeleton 2014-12-16 14:10:07 +01:00
Michael Hackstein 83004b08f4 Finished implementing upload and mount by github repo. This includes a checked dialog for configuration. This is reusable for zip / appstore as well 2014-12-16 14:10:06 +01:00
Michael Hackstein 37dd5cd218 Allowed foxxmanager to not throw an error if an app from github is already loaded but returns it id instead. Aardvark now pipes through the AppID plus a configuration 2014-12-16 14:10:06 +01:00
Lucas Dohmen 89b2283423 Cleanup foxxActiveView 2014-12-16 14:10:06 +01:00
Lucas Dohmen 111b89f1c6 foxxActiveView 2014-12-16 14:10:06 +01:00
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
Tomas Bosak 06ad1907ed Add missing return codes to API docs. 
Add missing return codes to API docs of read in/out/any edges operation.
 2014-12-16 11:30:25 +01:00
Patrick Huber c9fe2a6a9d mention 'byId' supports not only ids but also keys (from #1181) 2014-12-16 11:26:37 +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
Frank Celler 605f4d0a72 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-15 18:15:44 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Lucas Dohmen e8a474ef60 Fix Foxx JSDoc for Windows Line Endings 2014-12-15 10:00:26 +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
Frank Celler f99a53805c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2014-12-13 16:05:52 +01: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