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

9147 Commits

Author SHA1 Message Date
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