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

689 Commits

Author SHA1 Message Date
Jan Steemann f7c10cb2a6 added stack traces for ArangoError 2015-02-03 17:45:08 +01:00
Jan Steemann d06c3c1ff3 changed "file names" of anonymous commands 2015-02-03 12:46:34 +01:00
Willi Goesgens 293a3fe7d3 Differenciate whether we fail to locate or execute a script in error messages. 2015-01-27 12:25:40 +01:00
Jan Steemann 7af624e2f0 selectivty, try 0 2015-01-27 09:34:04 +01:00
Frank Celler 1b722fe368 generated files 2015-01-26 11:59:05 +01:00
Jan Steemann 8580d49aec added TRI_SimplifiedObjectToJson 2015-01-25 10:33:24 +01:00
Jan Steemann 0d8bf44215 gc adjustment 2015-01-23 20:51:42 +01:00
Jan Steemann 5d12a3da3b garbage collection 2015-01-23 16:45:00 +01:00
Willi Goesgens 26281d94c9 When throwing the exception of being unable to open a file add the filename. 2015-01-22 15:09:59 +01:00
Jan Steemann 37ae686d4b re-introduced odd (but compatible) behavior in ObjectToJson 2015-01-17 23:24:23 +01:00
Jan Steemann 9b66ab3a61 added AQL functions MD5, SHA1, and RANDOM_TOKEN 2015-01-17 22:40:47 +01:00
Jan Steemann 402d56c1af when parsing or converting JSON, create elements in-place if possible to avoid memory allocations 2015-01-17 21:48:18 +01:00
Jan Steemann af3fef03a0 fixed possible segmentation fault when passing a Buffer object into a V8 function as a parameter 2015-01-13 22:49:07 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 906d22a691 make fs.move() behave identical on Linux and Windows 
Conflicts:
	CHANGELOG
 2015-01-12 20:13:11 +01:00
Jan Steemann 8a86c798a1 use IndexedPropertyAccessor for Buffer 2015-01-09 16:51:22 +01:00
Jan Steemann 3ce99bae8c removed duplicate Reset() call 2015-01-09 10:41:26 +01:00
Jan Steemann f3b142849f fixed leaks during reverts 2015-01-03 01:28:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann 0c38d60732 less replacements in flex output 2014-12-17 17:26:37 +01:00
Jan Steemann cc3b97491d added derived files 2014-12-17 10:30:32 +01:00
Jan Steemann e8f51f1b5f issue #1185: parse non-fractional numbers with exponent 2014-12-17 10:28:48 +01:00
Jan Steemann 50e08ab099 removed unused file 2014-12-16 17:30:48 +01:00
Max Neunhoeffer bf915da2e3 Use an unordered_map for JSBarriers. 2014-12-16 09:57:44 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Frank Celler 10e07f1982 added generated files 2014-11-12 14:58:51 +01:00
Frank Celler 88d1f78464 Merge remote-tracking branch 'origin/2.3' into devel 
Conflicts:
	CHANGELOG
 2014-11-12 04:57:41 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann d4d3e37a0d added internal.parseFile 2014-10-30 19:18:05 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Willi Goesgens 28f3b27922 These are not pointers. 2014-10-27 15:52:00 +01:00
Willi Goesgens 2378e2cef3 - don't output pseudo filenames in errors 
- use nullptr
 2014-10-27 15:46:53 +01:00
Jan Steemann 0a0f5f86ab issue #1056: "fs": zip functions fail with passwords 2014-10-25 00:36:46 +02:00
Alan Plum 55f3c9829c Fixed PBKDF2 usage. 2014-10-22 17:29:17 +02:00
Jan Steemann 12ac3b8bdd added comment 2014-10-21 10:45:27 +02:00
Jan Steemann 3d70c55d85 fixed isatty handling 2014-10-21 10:43:30 +02:00
Jan Steemann fbdcffbd16 no colors if output is not a tty 2014-10-18 01:39:56 +02:00
Jan Steemann d4da8cb908 fixed arangosh 2014-10-17 13:25:49 +02:00
Jan Steemann 0aa02a696b pass ApplicationV8 to queries 2014-10-17 10:35:02 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann c946a1536a documentation for fs 2014-10-15 14:01:15 +02:00
Jan Steemann 6bd448be46 added support for reading / writing binary data in fs.readFileSync && fs.write 2014-10-14 19:07:16 +02:00
Jan Steemann 1ba2030e0b debug info 2014-10-13 11:10:12 +02:00
Jan Steemann d9cc80bab7 fixes for Visual Studio 2014-10-10 14:37:03 +02:00
Willi Goesgens 73d121ece7 Add the possible error messages from waitpid to the result output. 2014-10-10 11:44:48 +02:00
Willi Goesgens e433a2831e Add a new wrapper which does fork + waitpid in one js call, so we're closer to the flame and less eventually miss something. 2014-10-08 16:48:30 +02:00
Jan Steemann ff80fafba5 fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations 2014-10-08 14:59:02 +02:00
Jan Steemann 0f83d8132f fixed some transaction threading errors 2014-10-06 18:39:01 +02:00
Jan Steemann ce9499eac8 less string copying, less regex slowdown when importing CSV files 2014-09-30 23:20:12 +02:00
Jan Steemann 0d075dca3f pass queryRegistry into the AQL functions 2014-09-29 09:30:32 +02:00
Jan Steemann dbf964e204 small optimizations 2014-09-24 12:09:13 +02:00
Jan Steemann ddfb5c965d merged experimental features 2014-09-24 09:42:16 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 953b8cdfe3 renamed files 2014-09-13 00:34:48 +02:00
Jan Steemann 0dc0bc834f more files renamed 2014-09-13 00:20:30 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
 2014-09-09 22:18:52 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Alan Plum 6f9376e264 Fixed PBKDF2HMAC comment. 2014-09-05 16:35:27 +02:00
Alan Plum 469af580e5 Added PBKDF2-HMAC. 2014-09-05 16:23:37 +02:00
Alan Plum 4e3659c01a Added support for sha384, sha512. 2014-09-04 23:17:58 +02:00
Jan Steemann 005e727bde Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	lib/V8/v8-conv.cpp
 2014-09-01 16:15:32 +02:00
Jan Steemann 848ce68dc3 fixed too eager duplicates check for shaper 2014-09-01 15:48:58 +02:00
Jan Steemann 66d556b003 re-added cases for data types 2014-08-30 02:42:35 +02:00
Jan Steemann 799a845967 added V8StringConverter 2014-08-30 02:32:59 +02:00
Jan Steemann 6f5271823e use auto 2014-08-23 01:54:28 +02:00
Jan Steemann dcfa59806e more C++11 2014-08-23 00:51:13 +02:00
Jan Steemann 45d5d0f53a cppcheck 2014-08-22 13:53:21 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
 2014-08-13 16:29:57 +02:00
Jan Steemann 0a70e979f8 call `toJSON` function of objects (if present) when serializing 2014-08-13 16:05:58 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Jan Steemann cb2e9a8a37 fixed JSON conversion 2014-08-07 15:48:33 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann ac7b47c0b7 nullptr 2014-08-06 09:42:36 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
 2014-08-05 15:09:28 +02:00
Thomas Schmidts baf6635627 Added missing methods to fs module. fix #978 2014-08-05 13:37:40 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +02:00
Frank Celler e436ecfa40 if a cancelation has occured, flush the module cache 2014-07-08 11:54:53 +02:00
Frank Celler 0703809e00 added isIP 2014-07-07 18:46:02 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
Jan Steemann f939b079c4 recovery 2014-07-03 22:49:49 +02:00
Jan Steemann 1d051f4e1e fixed shaping of regexp/date objects etc 
this is disallowed, but due to an invalid sequence of if statements such attributes
were silently converted into `{ }` before and no error was returned to the user
 2014-07-03 16:58:40 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Thomas Schmidts a828ed3d08 Changed some code comments 2014-07-01 16:30:36 +02:00
Frank Celler 7bdc42a7d1 added yy_fatal_error unused function fix 2014-06-30 09:21:24 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Jan Steemann 96569367d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.cpp
 2014-06-26 13:07:53 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
Jan Steemann 723a0ab265 fixed some memory errors 2014-06-26 11:52:37 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
Jan Steemann 5dc4f31e29 dont provide functionality in non-debug mode 2014-06-24 00:34:53 +02:00
Jan Steemann 69eb029c56 CXX 2014-06-21 03:21:55 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Alan Plum a682767efc Added HMAC MD5. 2014-06-17 13:25:07 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann 229e710dd1 less memset 2014-06-05 01:15:40 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Jan Steemann 57d0d4a5ca inlined some functions 2014-05-28 21:12:16 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +02:00
Jan Steemann adfaf9b760 garbage collection 2014-05-26 16:06:18 +02:00
Frank Celler ecd5641d03 added i/o stats 2014-05-25 23:11:03 +02:00
Jan Steemann ea97d443b0 use wal shape and attribute markers 2014-05-22 16:00:00 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Max Neunhoeffer 786ea250ba Snapshot. 2014-05-21 11:20:03 +02:00
Esteban Lombeyda 11184fe003 Merge branch 'refactoring' of github.com:triAGENS/ArangoDB into devel 2014-05-19 13:51:29 +02:00
Esteban Lombeyda 963fdc5ee5 cleaning 2014-05-19 11:30:31 +02:00
Esteban Lombeyda 45ea4e6f57 reducing duplicate code 2014-05-17 15:47:13 +02:00
Jan Steemann b35c38236e fixed size bug 2014-05-17 10:48:59 +02:00
Jan Steemann e9c4a759f7 add string length to object creation 2014-05-17 01:37:36 +02:00
Jan Steemann a355c9d37f break instead of return 2014-05-16 20:26:06 +02:00
Esteban Lombeyda 7feb081a5f Merge branch 'refactoring' of github.com:triAGENS/ArangoDB into refactoring 
Conflicts:
	lib/V8/V8LineEditor.cpp
 2014-05-15 13:43:08 +02:00
Esteban Lombeyda e3ff0391a2 Refactoring LineEditor 2014-05-15 10:27:59 +02:00
Jan Steemann 9fa7fe20ea scan-build 2014-05-15 10:16:13 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann a02611fba1 case-insensitive completion 2014-05-14 18:43:01 +02:00
Jan Steemann 8a5c2438b9 removed tabs 2014-05-14 18:01:40 +02:00
Jan Steemann 9f7923ace3 fixed VS warnings 2014-05-13 13:39:42 +02:00
Jan Steemann 3f6d28de8d fixed VS warnings 2014-05-13 12:44:00 +02:00
Frank Celler 1048559dcf fixed percent 2014-05-12 00:38:03 +02:00
Jan Steemann dfec7b7f3c pass v8 handles by value, not by reference (as recommended in their manual) 2014-05-09 15:23:21 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Max Neunhoeffer 62ca0e9a30 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-07 16:47:06 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Esteban Lombeyda 6385569dec manualy unification of JS_ProcessStatistics in devel and 2.0 2014-05-07 10:43:44 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
Jan Steemann a4ee394d4b fixed AQL return codes in the face of cancellation 2014-04-23 19:07:34 +02:00
Frank Celler 6cdfa029c9 added more error information, fixed try catch 
Conflicts:
	CHANGELOG
	arangod/V8Server/ApplicationV8.cpp
 2014-04-21 13:35:06 +02:00
Frank Celler fc0ffd40b6 added missing figures 2014-04-10 11:48:35 +02:00
Jan Steemann fa391e0636 slight GC improvements 2014-03-24 16:12:59 +01:00
Jan Steemann 8d84c325f9 fix compile warning 2014-03-21 08:56:52 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Frank Celler ba63528b18 removed register 2014-03-17 15:44:09 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
Jan Steemann 65f66ec6d9 changed expression to satisfy clang 2014-03-12 15:40:57 +01:00
Max Neunhoeffer 101486c6af Improve error handling in process startup in js testing framework. 2014-03-07 15:01:50 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 3451c8a03e fixed createNonce call 2014-03-05 10:46:52 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Max Neunhoeffer e280ea9e91 First try to cleanup process startup for good. 
Unix: compiles and works.
Windows: tried to cleanup, did not try to compile yet.
 2014-03-03 17:02:16 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler e0552606c3 added residentSizePercent 2014-03-01 18:16:58 +01:00
Frank Celler cdf635d5c6 added residentSizePercent 2014-03-01 18:14:14 +01:00
Frank Celler e70c9bed21 added total memory for mac 2014-03-01 17:16:10 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann 242b3d5bbf const 2014-02-26 11:08:21 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Jan Steemann edfdda6d12 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 15:44:08 +01:00
Jan Steemann 0ac7ddaaf9 fix shell client test results 2014-02-25 15:43:57 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann b42f836202 prevent JSONification of cyclic objects 2014-02-24 14:50:47 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Frank Celler a2fb92948e added better error reporting 2014-02-22 13:00:00 +01:00
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Jan Steemann 211b0da24b moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
Max Neunhoeffer a58e261f16 Repair windows executeExternal. 2014-02-19 15:46:16 +01:00
Max Neunhoeffer 074ef1cb31 Unify process startup between Windows and not. 2014-02-19 15:01:37 +01:00
Max Neunhoeffer bc99b765d0 Add wait argument to statusExternal. 
Windows version untested.
 2014-02-17 16:40:11 +01:00
Max Neunhoeffer 3d27a9f0ad Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-14 14:44:45 +01:00
Max Neunhoeffer 076bc6e723 Cleanup socket abstraction for different OSes. 2014-02-14 14:44:27 +01:00
Frank Celler 6269c61aa7 Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 14:21:59 +01:00
Esteban Lombeyda d6094cf5de Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:41:38 +01:00
Esteban Lombeyda 6ccfa1aad2 starting and killing of windows process was implemented 2014-02-13 16:30:31 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-13 11:07:01 +01:00
Frank Celler 7a3176ac8d use new readline per default for mac 2014-02-13 11:03:48 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
 2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Max Neunhoeffer 650343a650 Fix download using different ports than 80. 
Handle errors better in SYS_TEST_PORT
 2014-02-11 09:51:36 +01:00
Esteban Lombeyda dbc4ef79eb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-07 16:33:52 +01:00
Esteban Lombeyda 8ab6290d65 Bug fix: tabulators work correct under microsoft windows. Needs 49ee3f0d0fc80cce300427a2ddbf519c61a7cb24 
of ArangoDB-Windows
 2014-02-07 16:30:04 +01:00
Max Neunhoeffer 340549624b Redirect on 307 as well if requested. 2014-02-06 09:14:27 +01:00
Max Neunhoeffer 6e08a96795 Fix bug with empty argument in makeAbsolute. 2014-02-04 11:50:21 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Frank Celler 988bd0b891 added port test 2014-01-31 18:38:02 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 5f8a59d696 all() sharded 2014-01-29 13:51:12 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Jan Steemann d8b5c60351 fixed segfault 2014-01-24 13:08:33 +01:00
Jan Steemann 481cd2d1be added collection._dbName 2014-01-16 11:10:37 +01:00
Jan Steemann 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Jan Steemann 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Max Neunhoeffer 11e018e6b2 Make global ArangoClusterComm object in each thread. 2014-01-07 11:50:05 +01:00
Max Neunhoeffer bbf28e3501 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/Cluster/v8-cluster.cpp
 2014-01-07 11:45:43 +01:00
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +01:00
Max Neunhoeffer 33d063d6d6 Start to move ClusterComm to JavaScript. 2014-01-06 16:18:24 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics 
Conflicts:
	CHANGELOG
 2013-12-13 16:00:02 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann 5e5a5fb32b added JS bindings for agency 2013-12-11 09:56:54 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Jan Steemann e79134799c mini optimisations for shaping 2013-11-22 02:41:39 +01:00
Frank Celler 01532b024e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 13:50:14 +01:00
Frank Celler 6e293d9dce fixed wrong error message on parse error 2013-11-20 13:50:08 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-11-14 01:01:24 +01:00
Jan Steemann 54abc6bd1d fix Windows path name comparison 2013-11-11 20:30:51 +01:00
Jan Steemann 60526230ab fix Windows path name comparison 2013-11-11 20:06:50 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 978c12815a share basic shape types 2013-11-05 20:21:48 +01:00
Jan Steemann 90e7ea3f97 typecasts 2013-11-05 10:19:21 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann e1382dd255 added detailed HTTP request statistics 2013-10-31 16:39:59 +01:00
Jan Steemann bcf6eabce7 fixed --javascript.check option for arangosh 2013-10-30 18:35:08 +01:00
Jan Steemann bc57a0c468 fixed --javascript.check option for arangosh 2013-10-30 18:33:42 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 43b4f78b62 issue #620 2013-10-28 19:38:19 +01:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +02:00
Jan Steemann cd5d228e77 moved path checks from --upgrade to server start and database creation 2013-10-16 15:30:13 +02:00
Jan Steemann 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 9155b16252 caching for db[...] 2013-09-21 00:12:35 +02:00