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

9264 Commits

Author SHA1 Message Date
Jan Steemann 6a4e9658c5 fixes for explainer and condition 2015-10-08 16:22:52 +02:00
Jan Steemann 0d80a17002 generalize condition handling 2015-10-08 15:10:28 +02:00
hkernbach d066a4283c issue: #1446 2015-10-08 14:02:36 +02:00
Jan Steemann fbfc7773ef serialization and deserialization of IndexNodes 2015-10-08 12:02:27 +02:00
Jan Steemann 4bf3bb047b Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-07 17:25:56 +02:00
Jan Steemann 71a25e798b mchacki: fixed development mode 2015-10-07 17:03:49 +02:00
Frank Celler 4b0911c799 added debugging header x-arango-v8-context 2015-10-07 13:37:35 +02:00
Jan Steemann a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-07 10:18:21 +02:00
Jan Steemann d54db0e3ff do not warn verbosely 2015-10-07 10:15:34 +02:00
jsteemann 358befddde added test for issue #1521 2015-10-06 22:36:09 +02:00
Alan Plum ea44c7710c Rebuild aardvark 2015-10-06 16:35:00 +02:00
Alan Plum 3325d46211 Unbreak aardvark shell 2015-10-06 16:18:23 +02:00
Alan Plum 820e694d0c Re-implement cleanupCancelation 2015-10-06 15:10:43 +02:00
Alan Plum 5b7f3d19d0 Deprecate CS in 2.9, not 2.8 2015-10-06 12:47:58 +02:00
Jan Steemann 849dad60cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-06 11:58:52 +02:00
Jan Steemann beaf3acbd3 simplifications 2015-10-06 11:58:23 +02:00
Alan Plum 7332f3803e Make org/arangodb/deprecated work in arangosh without db 2015-10-06 11:37:42 +02:00
Jan Steemann 1f009a046c Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-05 10:32:53 +02:00
Jan Steemann 1c990b7324 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	arangod/Aql/ExecutionNode.cpp
 2015-10-05 10:32:36 +02:00
Jan Steemann 3f622d71fb fixed some require issues 2015-10-05 10:28:44 +02:00
Jan Steemann 7d4c379598 small modifications, temporarily disabled interchange-adjacent-enumerations 2015-10-02 19:53:35 +02:00
Wilfried Goesgens 232d0601cb fix running of arangosh tests with the proper parametrization. 2015-10-02 15:47:01 +02:00
Wilfried Goesgens a968707134 Fix foxx-manager test for running in arangosh 2015-10-02 15:39:49 +02:00
Wilfried Goesgens 3060e1d63d lintify: break lines. 2015-10-02 15:01:38 +02:00
Wilfried Goesgens 353c01f04f don't output the result json when running from an interactive shell. 2015-10-02 14:47:57 +02:00
Wilfried Goesgens a5d8c12067 unittesting framework 
- don't output xml reports if we run single tests
  - add another token to the 'this is not a testcase name' list
 2015-10-02 13:38:25 +02:00
Jan Steemann 8247ec0dff Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-02 12:59:13 +02:00
Wilfried Goesgens 320ac8e1e8 Improve indent readability 2015-10-02 12:31:09 +02:00
hkernbach db7533acf8 jslint fix 2015-10-02 10:23:08 +02:00
hkernbach 3beb6a280f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-02 10:02:30 +02:00
hkernbach 51a20beef3 graph test view 2015-10-02 10:02:25 +02:00
CoDEmanX 41d6594246 Documentation formatting 2015-10-02 03:14:55 +02:00
Jan Steemann ab37a62858 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-01 17:29:24 +02:00
Wilfried Goesgens 1d2cf518dd Add --skipArangoBNonConnKeepAlive to skip this part of the test for os'es that have a problem with to frequent ip connection open/close (windows, macos) 2015-10-01 17:09:43 +02:00
Jan Steemann 4175463248 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-01 16:00:13 +02:00
Wilfried Goesgens c9cee71b2c Fresh swagger docu 2015-10-01 13:30:55 +02:00
Wilfried Goesgens aa12514b5c Fix links; currently links in REST-documentation only work in the RESTDESCRIPTION :-( 2015-10-01 13:30:55 +02:00
Jan Steemann c291a7117a Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-01 10:57:55 +02:00
Jan Steemann 7933fe5d4b restore 2.6 behavior for db-based modules 2015-10-01 10:51:23 +02:00
Wilfried Goesgens ab130a025f add prefix to system app contexts - they shouldn't live without namespaces. 2015-09-30 17:55:55 +02:00
Jan Steemann 9205739f6a added IndexNode 2015-09-30 14:10:04 +02:00
Jan Steemann 1ee1a87ae0 return proper errors to caller 2015-09-30 13:49:03 +02:00
Jan Steemann 74358962b5 fixed require on Windows 2015-09-30 13:06:36 +02:00
Jan Steemann 3b0b04b179 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-29 14:59:03 +02:00
Jan Steemann 96d8c24c61 fix app thumbnails 2015-09-29 14:58:35 +02:00
Frank Celler 3f8b2a4925 changed to dot notation 2015-09-29 14:14:57 +02:00
Frank Celler f8c79f1ab0 added ARANGODB_DEFAULT_ROOT_PASSWORD 2015-09-29 13:15:25 +02:00
Jan Steemann 7bd9f03cb1 issue #1510: Fix bug in the user app's storage in resolve function 2015-09-28 12:54:04 +02:00
Jan Steemann 2353fc648f fixed documentation errors 2015-09-28 11:56:39 +02:00
Alan Plum e26fc9b442 S'more. 2015-09-25 17:04:08 +02:00
Alan Plum 40837eacf1 Refactored db module loading 2015-09-25 17:02:51 +02:00
Alan Plum a58fc5fdfa Also add node/node_modules on Windows 2015-09-25 16:43:50 +02:00
Alan Plum 8c24b0c28b Fixed missing thumbnail 2015-09-25 16:40:03 +02:00
Jan Steemann 0e6b1e64da re-added reloadRouting() 2015-09-25 16:38:27 +02:00
Alan Plum 0fcb9ea46e Fixed applicationContext.collectionName 2015-09-25 16:32:17 +02:00
Wilfried Goesgens 06b0057bb1 Fix module loading 2015-09-25 16:24:17 +02:00
Jan Steemann 3ce21453c3 added derived files 2015-09-25 16:01:36 +02:00
Jan Steemann ace5bd8ec2 some fixes for the web interface 2015-09-25 16:01:13 +02:00
Jan Steemann 0ebf0be777 fixed Gruntfile to include cluster stuff 2015-09-25 15:07:24 +02:00
Wilfried Goesgens cba3ed80ae fix jslint: remove unused variable 2015-09-25 13:50:29 +02:00
Wilfried Goesgens b280c59aa7 Split tests that don't work in clusters. 2015-09-25 11:50:33 +02:00
Jan Steemann 9e1d4b0c9d updated CHANGELOG 2015-09-24 16:33:59 +02:00
Jan Steemann 7c992a5d51 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-24 16:05:15 +02:00
Jan Steemann 71f8d89eeb allow installing Foxx applications in /_open/ 2015-09-24 15:59:42 +02:00
Jan Steemann a430cb9f6c allow installing Foxx apps in /_open/ 2015-09-24 15:54:09 +02:00
Alan Plum 1a5f5fe65d Merge pull request #1508 from arangodb/require-sanity 
Node-compatible require implementation
 2015-09-24 15:50:40 +02:00
Jan Steemann 4249095456 issue #1507: added optional *allowImplicit* sub-attribute for transactions 2015-09-24 15:50:00 +02:00
Alan Plum 963d9b082e Removed hack for extension-free package main 2015-09-24 14:23:15 +02:00
Alan Plum ac3e4b0c49 Linting 2015-09-24 14:20:15 +02:00
Wilfried Goesgens a9ea2122d5 Revert 9cd38eba44 again. 2015-09-24 14:09:14 +02:00
Alan Plum 95d99ebd16 Make shell-foxx-manager-install-spec pass 2015-09-24 13:46:15 +02:00
Alan Plum 400532043f Fixed shell-foxx-manager-install-spec module use 2015-09-24 13:46:15 +02:00
Alan Plum 98d2560b4c Fixed shell-require test 2015-09-24 13:46:14 +02:00
Alan Plum 30588d556f Add support for 'main: "index"' and expose globalPaths 2015-09-24 13:46:14 +02:00
Alan Plum ef50d88f5e Moved queue creation to queue manager init 2015-09-24 13:46:14 +02:00
Alan Plum 67e2264603 Fixed cyclic import 2015-09-24 13:46:14 +02:00
Alan Plum f8ef55f437 Fixed Foxx preprocessing 2015-09-24 13:46:14 +02:00
Alan Plum 252cba5e9f Implemented FoxxService 2015-09-24 13:46:14 +02:00
Alan Plum 309dcb2c17 Partially implemented FoxxService 
The FoxxService class replaces ArangoApp and should contain the necessary logic to load Foxx services based on their manifests.
 2015-09-24 13:46:14 +02:00
Alan Plum 763d206c40 Rebuilt aardvark shell 2015-09-24 13:46:14 +02:00
Alan Plum f021cdc471 Implemented require from db collection 2015-09-24 13:46:13 +02:00
Alan Plum 038267cb06 Re-implemented require/module based on Node 4.1.0 
The require function should now behave as expected and treat ArangoDB's module paths as sources for "external" modules.
The "assert", "buffer" and "path" modules have been moved out of ./js/node into the bootstrap modules.
The module "org/arangodb/foxx/arangoApp" (as well as any modules depending on it) is incompatible with the new module loading behaviour and will be have to be rewritten from scratch.
The "Package" class has been removed entirely and is no longer needed.
Support for the database-stored modules is currently missing and needs to be re-implemented within the module loader.
 2015-09-24 13:46:13 +02:00
Alan Plum f19263ab78 Added eslintrc 2015-09-24 13:46:13 +02:00
Alan Plum 798b4fc521 Added more Node stubs 2015-09-24 13:46:13 +02:00
Alan Plum 52f1cf6e2c Updated util to 4.1.0 2015-09-24 13:46:13 +02:00
Alan Plum e57c383dea Updated path to 4.1.0 2015-09-24 13:46:12 +02:00
Alan Plum 69a4352394 Added unmentioned modules to VERSIONS 2015-09-24 13:46:12 +02:00
Alan Plum de7b507dea Updated querystring to 4.1.0 2015-09-24 13:46:12 +02:00
Alan Plum 77cca88c50 Updated string_decoder to 4.1.0 2015-09-24 13:46:12 +02:00
Alan Plum af7c11132a Updated url to 4.1.0 2015-09-24 13:46:12 +02:00
Alan Plum ae310b0696 Updated punycode to 4.1.0 2015-09-24 13:46:12 +02:00
Alan Plum 47f691ed36 Updated events to 4.1.0 2015-09-24 13:46:12 +02:00
Alan Plum ca793a3f5d Added http, https stubs 2015-09-24 13:46:12 +02:00
Jan Steemann 56a5912260 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-24 13:00:57 +02:00
Jan Steemann a8c97051f6 unified base URL (to not start with a slash, all other actions have base URLs that do not start with a slashes either) 2015-09-24 12:12:12 +02:00
Jan ebfdf38c08 Merge pull request #1505 from jsteemann/devel 
added generated files
 2015-09-24 12:04:56 +02:00
Wilfried Goesgens 9cd38eba44 Partially revert 6aabcb99c5 - this http interface is still required for blueprints. 2015-09-23 17:02:42 +02:00
hkernbach d21f375ade scss 2015-09-23 16:40:09 +02:00
Wilfried Goesgens 6aabcb99c5 Remove deprecated graph documentation. 2015-09-23 14:26:24 +02:00
Wilfried Goesgens 44c2063662 Add information about the graph the samples are querying so the user has a better overview. 2015-09-23 14:12:18 +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
Michael Hackstein a862f0ea30 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-09-22 11:46:32 +02:00
Michael Hackstein aa1242b67c Fixed a bug with AQL EDGES() function. It did not include the correct 
end of the edge when using inbound or outbound in combination with
includeVertices. Reported at
https://groups.google.com/forum/#!topic/arangodb/6yIpzLHprrk
 2015-09-22 11:46:11 +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
Jan Steemann 1e8ffad44e added generated files 2015-09-22 10:35:33 +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
CoDEmanX 7b95679040 Minor documentation fixes 2015-09-21 19:37:32 +02:00
Michael Hackstein a3e17f8eb6 Added a test for large skip value and skiplist sorting 2015-09-21 13:29:29 +02:00
Michael Hackstein 0d3a095736 Fixed a bug in AQL execution which caused LIMIT <skip> <total> to fail after sorting based on an attribute with skiplist index 2015-09-21 13:15:56 +02:00
Alan Plum 47a06b1fdc Pretty print classes in console 2015-09-19 05:03:45 +02:00
Alan Plum fb2d334741 Resolved merge conflict introduced in b6995ba. 2015-09-18 17:39:22 +02:00
Jan Steemann d1c75013e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-18 17:28:10 +02:00
Jan Steemann f2d42ec67c removed superfluous print statement 2015-09-18 17:27:25 +02:00
Wilfried Goesgens 15b1d7cfd5 Migrate sub-structured replies to swagger2 preproc docu style 2015-09-18 17:02:53 +02:00
Jan Steemann 5b65471540 added generated file 2015-09-17 17:52:41 +02:00
Wilfried Goesgens 2e91374cd6 Fresh swagger. 2015-09-17 17:28:37 +02:00
Wilfried Goesgens 435b6e9382 lint. 2015-09-17 17:28:26 +02:00
Wilfried Goesgens 90aab26866 Add html reply logger 2015-09-17 15:54:27 +02:00
Wilfried Goesgens 7f89e6e905 Add hint to the user that starting swagger may take a while. 
A throbber won't do, since swagger is synchroneous and the browser won't animate it.
 2015-09-17 13:29:49 +02:00
Wilfried Goesgens b06d03e84f Cleanup documentation for remaining @-tags 2015-09-17 11:15:33 +02:00
jsteemann 335e46d222 added generated documentation 2015-09-16 19:59:17 +02:00
jsteemann 0196dc0f51 documentation fixes 2015-09-16 19:58:59 +02:00
Jan Steemann 32113cc031 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-16 16:58:26 +02:00
Wilfried Goesgens 70a2c74c1b Update RESTAPI documentation handling to work with the swagger 2 api 
- use the structures from the swagger for post / reply structures
  - add missing documentation snippets to their respective places
  - fix syntax of documentation blocks
 2015-09-16 16:35:13 +02:00
Jan Steemann 74ca6ce9f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-16 16:11:05 +02:00
Jan Steemann 907d98f3dd fixes for sync 2015-09-16 16:10:56 +02:00
Frank Celler 2e2600311a added aliases 2015-09-16 16:05:18 +02:00
Frank Celler c892174c6a added nightly 2015-09-16 15:14:34 +02:00
Jan Steemann c5c51f14da added tests for syncCollection 2015-09-16 11:40:57 +02:00
Jan Steemann a1dc321516 added more compaction tests 2015-09-16 11:39:41 +02:00
Jan Steemann a1a87c0c34 jslint 2015-09-15 14:23:26 +02:00
Jan Steemann dc7ac83354 incremental sync fixes 2015-09-15 14:20:08 +02:00
CoDEmanX f13c2f1fce Alternative DATE_FORMAT() implementation 2015-09-15 11:43:57 +02:00
jsteemann de896edb5b fixed test 2015-09-15 00:16:26 +02:00
jsteemann 22e17814e3 additionally allow the following characters in document keys: 
`(` `)` `+` `,` `=` `;` `$` `!` `*` `'` `%`
 2015-09-15 00:16:08 +02:00
Jan Steemann 57f617c9a4 added derived file 2015-09-14 17:45:51 +02:00
Jan Steemann d2d3594351 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-14 17:45:09 +02:00
Jan Steemann 75ccd7e2cc fixed incremental sync method 2015-09-14 17:44:12 +02:00
Frank Celler b7bc8526d5 added engine match to available in FoxxManager 2015-09-14 16:52:05 +02:00
Jan Steemann 0c77b4fbe1 fixed tests 2015-09-14 11:55:39 +02:00
CoDEmanX 4158f7d12b Add AQL function DATE_DAYS_IN_MONTH(), extend DATE_FORMAT() 
Conflicts:
	js/server/modules/org/arangodb/aql.js
 2015-09-14 11:35:04 +02:00
CoDEmanX c4c22086e9 Alternative implementation of DATE_FORMAT() 
Conflicts:
	js/server/modules/org/arangodb/aql.js
 2015-09-14 11:31:44 +02:00
Jan Steemann 09efe111a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-14 10:53:12 +02:00