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

741 Commits

Author SHA1 Message Date
Andreas Streichardt 7b90f3040c parallelize cluster instance startup during test 2016-04-12 14:10:38 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Jan Steemann f45b6eeb49 jslint 2016-04-06 09:50:39 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Andreas Streichardt bad100312f fix testing 2016-04-05 14:16:48 +02:00
Andreas Streichardt 529199a9c3 streamline error log handling 2016-04-05 13:35:48 +02:00
Andreas Streichardt d46fba735b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-05 12:19:10 +02:00
Andreas Streichardt 0ac34f174a Fix agency test invocation 2016-04-05 12:18:53 +02:00
Jan Steemann 368f7e7f69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-05 11:29:58 +02:00
Jan Steemann 19c06e01dd fixed wrong text 2016-04-05 11:29:41 +02:00
Andreas Streichardt 6554cd9cee Fix dumpand restore stuff 2016-04-05 10:31:33 +02:00
Andreas Streichardt bda650e112 remove oboslete variables 2016-04-05 08:46:21 +02:00
Andreas Streichardt 47facc7f50 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-04 19:27:53 +02:00
Andreas Streichardt 49a3d3e018 Cleaning up the ifs....Greatly simplifying testing.js 2016-04-04 19:26:30 +02:00
Andreas Streichardt a0e6778ab2 fix jslint 2016-04-04 18:16:45 +02:00
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Andreas Streichardt 1150d2b06a Talk to coordinator 2016-04-04 15:11:10 +02:00
Kaveh Vahedipour 47bac5b4d9 temporary fix of jslint errors 2016-04-04 14:58:25 +02:00
Andreas Streichardt d56500b4c0 Implement cluster tests 2016-04-04 13:35:30 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Michael Hackstein 118cc6c141 Reoming Documents in Cluster case now reacts to old revisions 2016-03-30 18:19:45 +02:00
Michael Hackstein 9d70091713 The RestEdges handler now behaves identically to the server side edges() functions. Specifically it does not return duplicate edges any more. Also added a helper function to build an EdgeIndex Lookup from VPackArray. 2016-03-30 10:13:09 +02:00
Kaveh Vahedipour 7959f01d4a Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-29 11:10:24 +00:00
Jan Steemann ecf2deadb8 jslint 2016-03-24 19:35:37 +01:00
Jan Steemann 5166dc72d2 jslint 2016-03-24 19:32:31 +01:00
Jan Steemann d9c5877054 test fixes 2016-03-24 19:25:25 +01:00
Jan Steemann 07e43276c6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 18:20:37 +01:00
Kaveh Vahedipour afad06d1d0 updating tests 2016-03-24 17:54:02 +01:00
jsteemann 20dfe7ca9e fixed test 2016-03-24 01:50:55 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour 9677db67a6 turning off lights in agency? 2016-03-23 11:44:46 +01:00
Kaveh Vahedipour 4f152db27f Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-23 08:59:10 +00:00
Jan Steemann 7f95833505 fixed tests 2016-03-22 16:14:52 +01:00
Jan Steemann d226175e91 test fixes 2016-03-22 15:15:43 +01:00
Jan Steemann ecf3120190 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 13:24:17 +01:00
Frank Celler ad5828f122 fixed shebang test 2016-03-21 12:04:05 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Frank Celler 34164794cf fixed call 2016-03-20 22:26:02 +01:00
Frank Celler d3658aefe6 fixed valgrind 2016-03-20 21:28:27 +01:00
Frank Celler b736282bbc fixed non shebang 2016-03-20 18:56:50 +01:00
Frank Celler c2451cbf02 added missing wait 2016-03-20 13:31:13 +01:00
Frank Celler e6e367c1ca fixed chmod 2016-03-19 23:21:59 +01:00
Frank Celler 6dd99abe65 flag --skipShebang 2016-03-19 20:57:21 +01:00
Frank Celler 9707129b2f fix for travis 2016-03-19 19:38:33 +01:00
Frank Celler 6fa973d87d added shebang test 2016-03-19 16:17:55 +01:00
Frank Celler 3fb8685d09 only run suites if the exists 2016-03-18 21:18:03 +01:00
jsteemann 1bd1463b4b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 20:22:25 +01:00
Frank Celler e51e764fb5 added ruby locator 2016-03-18 20:18:15 +01:00
Kaveh Vahedipour 3d3fb23a62 writing test 2016-03-18 18:59:06 +01:00
Frank Celler a7361dca7f added rspec option 2016-03-18 18:33:36 +01:00
jsteemann 82a1c58429 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 11:03:54 +01:00
Frank Celler def5b35a84 jslint fixes 2016-03-18 11:02:42 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Frank Celler 970f38390b removed transaction key 2016-03-18 09:34:49 +01:00
Max Neunhoeffer 3ced50dc2a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-18 02:07:09 +01:00
Max Neunhoeffer d1c5c64d6b Fix baby methods for documents in arangosh. 2016-03-18 02:05:19 +01:00
jsteemann 47a9ea189b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 22:57:25 +01:00
Max Neunhoeffer c9d9ec048c Babies for remove() in client. 2016-03-17 21:15:01 +01:00
Frank Celler 782268fb55 fixed arangob tests and cluster check 2016-03-17 20:04:41 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key. 
Fix more document methods.
 2016-03-17 18:49:52 +01:00
Max Neunhoeffer da3730d98b Fix arangosh behaviour for documents. 2016-03-17 15:53:24 +01:00
Frank Celler ca59be449f added server_http 2016-03-17 09:34:49 +01:00
Max Neunhoeffer 95888c1b7c Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-16 19:56:17 +01:00
Max Neunhoeffer 7ef9fa9c15 Fix client document handling. Unfinished. 2016-03-16 19:56:01 +01:00
jsteemann 333bda5df1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 14:51:08 +01:00
Frank Celler d9f9b8b65d fixed server version 2016-03-16 13:01:18 +01:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Max Neunhoeffer a8ff672ba7 Fix arangosh w.r.t. withdrawn /_api/edge 2016-03-10 13:11:07 +01:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Frank Celler 261e98bc3a fixed test dir 2016-03-01 17:49:57 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Max Neunhoeffer 8bd4b12d47 Add a first version of agency test framework. 2016-02-26 14:37:55 +01:00
jsteemann ca9f5f1709 removed redundant test 2016-02-24 00:21:20 +01:00
Frank Celler 41ab5647e6 added recover --test 2016-02-23 23:23:37 +01:00
Frank Celler 5ac3beb02d added sanitizer for longer timeouts 2016-02-20 12:01:31 +01:00
Frank Celler 4dbf7be8dc check for location of etc 2016-02-19 10:44:06 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
Frank Celler 603afe6e5a fixed pathes 2016-02-18 16:30:52 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Frank Celler 812bfbb5ed added help on empty call 2016-02-11 12:30:31 +01:00
Frank Celler 7b3fc6d09f use information from testresult.json 2016-02-11 12:12:51 +01:00
Frank Celler f9f935df99 added duration 2016-02-11 08:58:07 +01:00
Frank Celler 251fcb8113 allow more than one test target 2016-02-10 23:21:06 +01:00
Frank Celler 5a44da965a skip non-conn-keep-alive test by default 2016-02-10 09:35:09 +01:00
Jan Steemann c408691e60 make drop never fail 2016-02-09 11:42:21 +01:00
Frank Celler 78970493a8 fixed core path 2016-02-08 16:48:23 +01:00
Frank Celler 91f5eda895 fixed result 2016-02-07 19:54:56 +01:00
Jan Steemann 993cf0b0b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-07 19:48:04 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
Frank Celler 59cbebc870 added stress test for killing 2016-02-07 19:35:37 +01:00
Frank Celler a16ca3d77e added recovery 2016-02-07 14:43:33 +01:00
Frank Celler f85f18bd78 moved tests to testing.js 2016-02-07 13:46:34 +01:00
Frank Celler 4054ddabf5 added http_replication to testing.js 2016-02-07 11:43:46 +01:00
jsteemann 0c9e4bef18 report progress while synchronizing 2016-02-07 00:24:22 +01:00
Frank Celler 546ffce3ed added replication test 2016-02-06 23:30:22 +01:00
Frank Celler 559987a49f moved unittests-dump-authentication to testing.js 2016-02-06 22:50:16 +01:00
Frank Celler 773d639049 moved unittests-dfdb to testing.js 2016-02-06 21:43:57 +01:00
Frank Celler c727d1de6b removed targets covered by testing.js 2016-02-06 20:38:48 +01:00
Frank Celler 025ad2e04c fixed skipAuth comment 2016-02-06 17:09:19 +01:00
jsteemann 37c46024df print progress while synchronizing 2016-02-06 16:54:25 +01:00
Frank Celler 50b2c499e7 added skipSsl to defaults 2016-02-06 00:56:20 +01:00
Frank Celler 4264fae2ab fixed valgrind for testing 2016-02-05 18:22:26 +01:00
Frank Celler ab5b1bb436 fixed external checking im cluster 2016-02-05 14:59:41 +01:00
Andreas Streichardt 8075cdc30f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 14:25:45 +01:00
Andreas Streichardt 584c3564c6 Rework unittest cluster start logic 2016-02-05 14:25:17 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Frank Celler e98c8b0758 changed sync to actively wait for result to avoid timeouts 2016-02-04 22:20:35 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 0dff6cfaa1 cleanup 2016-02-04 16:38:35 +01:00
Frank Celler ea040037cb unified naming (all_ok, ok => status) 2016-02-04 12:34:31 +01:00
Frank Celler 75d5cabcaf fixed error handling 2016-02-01 23:54:26 +01:00
Frank Celler 21b35416ea fixed premature killing of dispatcher 2016-02-01 17:52:10 +01:00
Frank Celler 3154338863 throw in case of error 2016-02-01 12:30:10 +01:00
Frank Celler 3b957b9e99 added deadlock test 2016-01-31 22:44:34 +01:00
Wilfried Goesgens 8cbbd98795 Silence unneeded stackframes of rspec. 2016-01-26 18:02:09 +01:00
Jan Steemann a606f2b0fd fixed broken sentence 2016-01-26 16:16:29 +01:00
Frank Celler 03eefbe9e7 added stress test 2016-01-26 13:47:16 +01:00
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