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

568 Commits

Author SHA1 Message Date
Frank Celler 1c2fcefe75 fixed jslint errors 2016-01-25 23:57:33 +01:00
Wilfried Goesgens 7e791d2a44 Add possibility to skip tests which tend to be non deterministic for release processes. 2016-01-25 18:07:25 +01:00
Frank Celler dd76a3d162 added crud test 2016-01-25 14:48:04 +01:00
Jan Steemann af5c6af5db fixed dump test 2016-01-25 12:56:05 +01:00
Wilfried Goesgens 0f389c6040 Fix arangosh tests to have the proper layer. 2016-01-25 11:39:15 +01:00
Frank Celler 732fb58f86 moved into sub-directories 2016-01-24 13:16:05 +01:00
Frank Celler c2a3f90fde moved tests into sub-directories 2016-01-24 12:21:04 +01:00
Frank Celler 112cb34bc7 fixed merge errors 2016-01-23 21:27:04 +01:00
Frank Celler 764a95ea2a switch to testing.js, moved testing.js to client 2016-01-23 21:07:42 +01:00
Jan Steemann d0ce5310e0 fix version strings 2016-01-21 16:11:48 +01:00
Frank Celler ff11db7b78 added threadNumber to identify a thread 2016-01-19 13:57:30 +01:00
Jan Steemann b16d9ee052 jslint 2016-01-15 10:38:20 +01:00
Frank Celler 828a2eb1ce added time 2016-01-15 09:52:31 +01:00
Frank Celler c439c82a24 added error handling 2016-01-13 18:28:50 +01:00
Frank Celler 4795546023 cleanup 2016-01-13 18:10:51 +01:00
Frank Celler 23e050ab8e added workOverview 2016-01-13 18:10:51 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
Jan Steemann 3cfd8214a9 handle id and isSystem when creating collections 2015-12-18 20:16:39 +01:00
jsteemann 11355b6e6f jslint 2015-12-16 20:09:22 +01:00
Wilfried Goesgens e93949674b while printing the cursor info check for whether its extra section contains a warning. 2015-12-16 14:06:37 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Jan Steemann 69fe6bf257 updated documentation 2015-12-01 12:13:15 +01:00
Jan Steemann ae8904a5b6 added async flag for sync() and syncCollection() 2015-12-01 12:04:40 +01:00
Jan Steemann 16bdc37447 fixed parse error 2015-11-03 10:21:34 +01:00
Frank Celler e4eff4c16f reverted 71c37439a8, 3dbb101b4a, af6202e3e7 because of missing CLA 2015-11-03 10:21:33 +01:00
Frank Celler 6ef373aa47 reverted 9147856636 because of missing CLA 2015-11-03 10:21:33 +01:00
Frank Celler 901f68f28a reverted 0692264fe2, cbe78e3b1f, 61d3846356, e26c2295fb, 6bc34aa8ce, c0e9db0769 because of missing CLA 2015-10-29 19:59:43 +01:00
Jan Steemann 3396214a63 added db._explain() convenience function 2015-10-21 12:52:40 +02:00
Jan Steemann bb0051b739 fixed hard-coded `incremental` parameter in shell implementation of `syncCollection` function in replication module 2015-10-13 09:33:15 +02:00
Jan Steemann e49064e5c4 hide `fm` variable in web interface shell 2015-10-09 15:25:56 +02:00
Frank Celler 2410437bdc be less verbose 2015-10-09 14:40:21 +02:00
Jan Steemann dc7ac83354 incremental sync fixes 2015-09-15 14:20:08 +02:00
jsteemann 22e17814e3 additionally allow the following characters in document keys: 
`(` `)` `+` `,` `=` `;` `$` `!` `*` `'` `%`
 2015-09-15 00:16:08 +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
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
TJ Walker 9147856636 Fix #41469 2015-09-02 18:03:10 -07:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Jan Steemann b58ecfe206 added firstTick() 2015-08-21 17:11:40 +02:00
Jan Steemann 9e08b1ebc5 add tickRanges() function 2015-08-21 17:00:32 +02:00
Alan Plum a8516913a2 Revert "added updateDeps" 2015-08-10 14:56:01 +02:00
Willi Goesgens f44d246a34 Lintify. 2015-08-05 09:19:10 +02:00
Willi Goesgens a5337ccdcb fix usage of db._query() when generating documentation. 2015-08-04 18:41:37 +02:00
Jan Steemann 20c96b5e46 removed locks 2015-07-21 17:34:57 +02:00
Alan Plum b214a02e70 Merge pull request #1416 from sarasfox/foxx-manger-updateDeps 
added updateDeps to foxx-manager.
 2015-07-16 14:48:11 +02:00
kevin cloinger 71c37439a8 added updateDeps and a comma 2015-07-16 03:02:35 -06:00
kevin cloinger 3dbb101b4a added updateDeps 
Added updateDeps to foxx-manager cli for use with salt. please give good look over this.
 2015-07-16 02:42:56 -06:00
Jan Steemann 1f5e047486 query cache, now with result limitations, HTTP and JavaScript APIs 2015-06-27 01:12:32 +02:00
Alan Plum eb4c2c7273 Fixed name conflict. 2015-06-10 18:02:23 +02:00
Jan Steemann 4e33128092 adjusted links 2015-06-05 10:08:52 +02:00
Jan Steemann 5989157ee5 fixed link 2015-06-05 09:21:54 +02:00
Alan Plum 993ad1e0ea De-IFFE-ify all the modules. 2015-06-03 13:08:58 +02:00
Alan Plum bf6501c02b FM: script -> run 2015-06-02 15:48:05 +02:00
Alan Plum 4fe795db3c Implemented script args and results. 2015-05-26 19:52:06 +02:00
Alan Plum 9296e6ea23 Fixed script invocation and configure/set-deps. 2015-05-26 19:52:06 +02:00
Alan Plum a98f1b088e Readability. 2015-05-26 19:52:05 +02:00
Frank Celler d295f87459 added check for newer version 2015-05-26 14:06:50 +02:00
Jan Steemann f8d68b2c5f fixed wrong fcall 2015-05-22 11:51:11 +02:00
Willi Goesgens 17da88a12f remove pattern match trying to detect files; a stat is more precise. 2015-05-22 10:46:04 +02:00
Willi Goesgens 04afbf4ae0 check whether appInfo is something on the filesystem which we like; if - upload it. 2015-05-18 15:19:27 +02:00
Max Neunhoeffer a3923c9eaf Fix configurability of indexBuckets. 2015-05-18 01:39:54 -07:00
Max Neunhoeffer 13204298d9 Make number of buckets in edge index configurable. 2015-05-17 19:04:47 -07:00
Michael Hackstein f320e74c2d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-05-11 17:21:32 -07:00
Michael Hackstein 7d3ad7ee46 Fixed a bug with upgrade and replace of foxx apps from local files. Closes #1292 2015-05-11 17:21:23 -07:00
Jan Steemann 40067e6c96 added documents() 2015-05-08 17:11:44 +02:00
Alan Plum f6532478b8 FM: Allow passing script options. 2015-05-07 23:16:05 +02:00
Alan Plum 71c2e06649 Linting. 2015-05-06 17:33:05 +02:00
Alan Plum d6ff3d7333 Fixed wrong function name. 2015-05-06 17:30:14 +02:00
Alan Plum be40214b1f Added script command to FM. 2015-05-06 17:15:36 +02:00
Alan Plum ef11e3a622 Added missing exports. 2015-05-06 17:15:36 +02:00
Alan Plum f3ef5a048e Sorting. 2015-05-06 17:15:35 +02:00
Alan Plum a20c9ee16e Added dependencies and set-dependencies manager commands. 2015-05-06 17:15:35 +02:00
Alan Plum c682bf9923 Don't use aardvark in foxx-manager. 2015-05-06 16:54:50 +02:00
Jan Steemann c677ea8b88 added tests for collection.lookupByKeys() and collection.removeByKeys() 2015-05-05 17:57:33 +02:00
Jan Steemann b0924956f8 allow `@` character in document keys, too. 2015-04-30 21:28:26 +02:00
Jan Steemann a8855908f6 less copying 2015-04-30 18:36:17 +02:00
Alan Plum 0f475dc099 Lint. 2015-04-15 19:54:22 +02:00
Alan Plum af9abcbc1d Added 'tests' command to foxx-manager. 2015-04-15 18:18:24 +02:00
Jan Steemann 7e0597f215 fixed cursor output in browser shell 2015-04-15 12:00:35 +02:00
Alan Plum 69e63c2c64 Strict mode all the things. 2015-04-09 00:22:05 +02:00
Jan Steemann 748107b291 changed behavior of `db._query()` in the ArangoShell: 
if the command's result is printed in the shell, the first 10 results will be printed. Previously
only a basic description of the underlying query result cursor was printed. Additionally, if the
cursor result contains more than 10 results, the cursor is assigned to a global variable `more`,
which can be used to iterate over the cursor result.

Example:

    arangosh [_system]> db._query("FOR i IN 1..15 RETURN i")
    [object ArangoQueryCursor, count: 15, hasMore: true]

    [
      1,
      2,
      3,
      4,
      5,
      6,
      7,
      8,
      9,
      10
    ]

    type 'more' to show more documents

    arangosh [_system]> more
    [object ArangoQueryCursor, count: 15, hasMore: false]

    [
      11,
      12,
      13,
      14,
      15
    ]
 2015-04-04 19:42:55 +02:00
Michael Hackstein 6d389c7bca Fixed a bug where an app installed from zip file is deleted by foxx manager. 2015-03-17 17:02:17 +01:00
Michael Hackstein 63ef6ba1aa Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-12 17:48:01 +01:00
Michael Hackstein c3b350054b Fixed configuration of Foxx apps. It was not fully working in foxx manager 2015-03-12 17:47:56 +01:00
Jan Steemann f035ea1c3b kill AQL queries 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2015-03-12 15:00:14 +01:00
Jan Steemann e67c82c8a4 added JavaScript APIs for query tracking 2015-03-12 13:02:14 +01:00
Michael Hackstein 89a11587b3 Fixed regex to identify Windows absolute and relative pathes also 2015-02-23 15:08:06 +01:00
Jan Steemann f29591135a adjusted geo index API 2015-02-18 14:59:46 +01:00
Michael Hackstein 4bcadadde2 Added the option to not execute the teardown script. 2015-02-16 18:06:42 +01:00
Michael Hackstein 5b3fae42aa Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	lib/Basics/voc-errors.cpp
	lib/Basics/voc-errors.h
 2015-02-13 10:20:36 +01:00
Jan Steemann efd9d0ed82 updated index API methods 2015-02-08 14:13:03 +01:00
Michael Hackstein cb122cddf1 Added list development to clientside foxx manager. Fixed a wrong error description 2015-02-05 21:50:47 +01:00
Michael Hackstein 10ece1f881 Included development, production, configure and configuration in the client implementation of FoxxManager. 2015-02-04 15:55:30 +01:00
Michael Hackstein 34458bad92 Added a check to validate the foxx mount point 2015-02-02 13:36:12 +01:00
Michael Hackstein 8e562b2268 Merge branch 'foxx-pathes' of github.com:triAGENS/ArangoDB into foxx-pathes 
Conflicts:
	js/client/modules/org/arangodb/foxx/manager.js
	js/common/modules/org/arangodb/foxx/manager-utils.js
	js/common/modules/org/arangodb/foxx/store.js
	js/server/modules/org/arangodb/foxx/manager.js
 2015-01-26 16:53:34 +01:00
Michael Hackstein c72a967e0d Fixed a bug in foxx manager install local file/directory behaviour. It always loaded file from server not from client when using shell. 2015-01-26 15:34:42 +01:00
Michael Hackstein 9620680d7f Improved output for client foxx manager. Also the serverside foxx manager will now return a simplified json version of the app 2015-01-26 11:59:06 +01:00
Michael Hackstein 900fce9f4a Installing a foxx app is now possible from App store. 2015-01-26 11:58:16 +01:00
Michael Hackstein b36e179ea3 Adapted client side foxx manager to new code base. Simplified it a lot 2015-01-26 11:54:29 +01:00
Michael Hackstein 939e12c458 Removed foxx store and client foxx manager dependency on common/bootstrap/module 2015-01-26 11:36:19 +01:00
Michael Hackstein bf9f3fc3a8 Created a foxx store module that wraps around the foxx application store. It is now used from the client and server side foxx manager 2015-01-26 11:36:19 +01:00
Michael Hackstein 76be034334 Improved output for client foxx manager. Also the serverside foxx manager will now return a simplified json version of the app 2015-01-22 13:56:00 +01:00
Michael Hackstein a92f6379f8 Installing a foxx app is now possible from App store. 2015-01-21 13:34:22 +01:00
Michael Hackstein ed53903780 Adapted client side foxx manager to new code base. Simplified it a lot 2015-01-16 17:24:10 +01:00
Michael Hackstein d7f17ee1d1 Removed foxx store and client foxx manager dependency on common/bootstrap/module 2015-01-16 16:16:22 +01:00
Michael Hackstein 39edb08e9d Created a foxx store module that wraps around the foxx application store. It is now used from the client and server side foxx manager 2015-01-16 16:16:22 +01:00
Frank Celler bbf239e762 fixed end-of-tutorial 2015-01-04 22:04:46 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +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
Jan Steemann 5c9e52ea20 pass query parameters 2014-12-09 17:16:03 +01:00
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
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Max Neunhoeffer 85d3c43ab0 Revert "More error output if update() in foxx manager fails." 
This reverts commit 3e6822a3917eb18ad45b6a0f145c87ca686fc54c.
 2014-11-28 16:16:16 +01:00
Max Neunhoeffer 5f217c5781 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 14:43:54 +01:00
Max Neunhoeffer b44b98c8ee More error output if update() in foxx manager fails. 
This is a temporary output to track down the continuous testing
problems.
 2014-11-28 14:43:09 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
fagnercarvalho e26c2295fb Fixing collection help output misspelled errors 2014-11-20 09:36:06 +01:00
Jan Steemann 675e2a0d40 fixed WITHIN_RECTANGLE for cluster 2014-11-17 12:32:43 +01:00
Willi Goesgens d96907d8da Implement tastks REST api 
- Implement REST api for tasks
 - Implement wrappers in arangosh
 - Add API-documentation
 - move unittest from server to common
 2014-11-11 12:39:09 +01:00
Jan Steemann c3a5b9a92d updated documentation 2014-11-03 15:32:00 +01:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann e18fbb38c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-31 17:31:13 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Thomas Schmidts 38bc690ecd Changed wrong documentation links 2014-10-31 15:19:49 +01:00
Jan Steemann c19060da27 changed www.arangodb.org to www.arangodb.org 2014-10-30 19:17:25 +01:00
Jan Steemann 4418e58315 removed old-style Doxygen sections 2014-10-30 01:16:07 +01:00
Jan Steemann e581aa6612 fixed usage of AQL user-defined functions from web UI 2014-10-27 11:09:20 +01:00
Jan Steemann 9b33081373 fixed typo 2014-10-27 10:13:06 +01:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann c89a3223f6 added missing newline 2014-09-09 22:40:13 +02:00
Alan Plum b384563d97 Linting: tutorial, changes. 2014-09-02 22:21:45 +02:00
Alan Plum e86c98dfe2 Enabled unused: true, ported aardvark jslint to jshint. 2014-09-02 22:18:18 +02:00
Alan Plum 7b24bdba8d Enabled strict: true. 2014-09-02 22:16:07 +02:00
Alan Plum 606da1e3e8 Removed jslint headers from server/client/common modules. 2014-09-02 22:14:56 +02:00
Alan Plum 6a3386e55a Fixed jshint headers. 2014-09-02 22:12:45 +02:00
Jan Steemann 574b3f3d18 added ArangoShell tutorial 2014-08-30 19:46:20 +02:00
Jan Steemann dbe107ce65 jslint 2014-08-06 13:50:21 +02:00
Jan Steemann 55e0622e06 throw "real" exceptions when passing bad parameters to update/replace/remove/exists 2014-08-06 13:38:33 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00
Jan Steemann 158cdd1c7a improved printing of cursors 2014-07-06 00:44:37 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0a230b77e3 jshund 2014-07-02 00:17:25 +02:00
Jan Steemann a5cf53d417 fixed examples 2014-07-01 16:48:47 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
Jan Steemann b9c688d117 removed doxygen comments 2014-06-20 14:39:05 +02:00
Heiko Kernbach 6191403181 jslint 2014-06-20 10:35:40 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
Jan Steemann 9690c26d67 jslint 2014-06-16 14:48:52 +02:00
Frank Celler 50b6533d0d added configuration to manifest, install and mount 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-16 12:57:17 +02:00
Michael Hackstein 920cf4b7c3 Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark 2014-06-06 15:00:26 +02:00
Michael Hackstein 5228984679 Fixed graph tests 2014-05-28 21:48:22 +02:00
Max Neunhoeffer 49a76d18a8 IsHealthy for clusters on client of dispatcher. 2014-05-28 15:44:08 +02:00
Max Neunhoeffer c53f17f66a Implement cluster upgrade in Kickstarter. 2014-05-28 15:17:19 +02:00
Esteban Lombeyda fa9a7263a8 more documentation yet 2014-05-28 10:53:00 +02:00
gschwab dc0c91c038 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 09:25:29 +02:00
gschwab e955d27f7b arango-blueprints updated to use new graph sturcture 2014-05-28 09:22:35 +02:00
Esteban Lombeyda d278fdc28e Bug fix: in updateByExample 2014-05-27 16:27:03 +02:00
Esteban Lombeyda a1eed266fd Bug fix: sending data in correct format 2014-05-27 15:49:44 +02:00
Esteban Lombeyda ca911c9245 Bug Fix: replaceByExample 2014-05-27 14:01:18 +02:00
Esteban Lombeyda 4e7af1f2e6 using correct parameter name (jslint thanks) 2014-05-26 16:15:38 +02:00
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +02:00
Esteban Lombeyda 9774991e31 strong examination of function parameters 2014-05-22 15:41:21 +02:00
Esteban Lombeyda bcd8490c1b Supporting new signature for remove function 2014-05-22 14:35:17 +02:00
Esteban Lombeyda f8c330ce54 Supporting new signature for replace function 2014-05-22 10:31:01 +02:00
Esteban Lombeyda 4af97257b9 Buf fix: Java Script Syntax error 2014-05-21 12:51:25 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
Jan Steemann af76ccfe3c issue #839: Foxx Manager missing "unfetch" 
Conflicts:
	CHANGELOG
 2014-04-23 15:09:03 +02:00
Jan Steemann ec26253f77 fix handling of properties with value `false` 2014-04-22 11:31:23 +02:00
Frank Celler 76b4c71d2e added isSystem to default representation 2014-04-17 09:46:10 +02:00
Frank Celler 39fd596abc changed return of users.remove 
Conflicts:
	js/actions/api-user.js
 2014-04-16 19:56:04 +02:00
Frank Celler 22ad916024 added configuration module, documentation is not there yet 2014-04-13 14:20:09 +02:00
Jan Steemann c8d21f5cb3 issue #818: Foxx: foxx-manager spelling error in shell 2014-04-11 12:15:13 +02:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Frank Celler 35bb498614 be less verbose 2014-03-07 11:59:01 +01:00
Jan Steemann 7664d75e6d prevent usage of _useDatabase() in web interface 2014-03-05 13:04:32 +01:00
Jan Steemann 028bf5b94b re-added isvolatile to result 2014-02-26 13:06:14 +01:00
Jan Steemann 27e59aa9a3 do not cache collection status 2014-02-26 11:25:24 +01:00
Jan Steemann 96938512c1 return numberOfShards, shardKeys 2014-02-26 11:02:08 +01:00
Jan Steemann 8fe19fa897 fixed index tests 2014-02-25 11:55:39 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Jan Steemann 74d419cc3d jshund 2014-02-12 17:15:12 +01:00
Max Neunhoeffer 733e94ad0a Improve error reporting in arangosh with kickstarter. 2014-02-12 09:36:35 +01:00
Max Neunhoeffer 97ff9d086d Forward planner and kickstarter to arangosh. 2014-02-11 15:40:33 +01:00
Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
 2014-01-31 11:31:09 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-01-21 09:29:45 +01:00
Jan Steemann 0bbbd53d4d added fm.rescan() method 
Conflicts:
	CHANGELOG
 2014-01-17 14:06:27 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Jan Steemann d8ac4046f8 added fm.configJson method 2014-01-15 18:07:47 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Jan Steemann 705efbfb07 improved error and help messages 2013-12-04 22:42:05 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00