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

952 Commits

Author SHA1 Message Date
Jan Steemann af4be86cef fixed doxygen errors 2013-03-24 18:31:23 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Frank Celler 1736221bac fixed cyclic objects 2013-03-24 10:57:44 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Frank Celler d1dab99248 more debug info 2013-03-23 18:07:37 +01:00
Frank Celler a1429ef749 more debug info 2013-03-23 18:03:17 +01:00
Frank Celler 961552b753 added trace for failed conversion 2013-03-23 17:32:32 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-fs.js
 2013-03-23 14:36:45 +01:00
Jan Steemann 6cd509c8e5 added fs.isFile() 2013-03-23 14:27:10 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Jan Steemann 40199d64b7 fixed handling of empty and reserved attribute names in documents 
specifying an empty attribute name in a document may have led to segmentation faults
when the document was unpacked later.
 2013-03-20 11:48:33 +01:00
Jan Steemann 54d05e35e6 const 2013-03-19 11:32:27 +01:00
Frank Celler f9ba951999 fixed comments 2013-03-15 13:42:52 +01:00
Jan Steemann 12a0bc787c empty string optimisations 2013-03-14 16:41:28 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo) 
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
 2013-03-11 09:49:58 +01:00
Jan Steemann 1a7e6b2d5b colorize! 2013-03-08 18:36:11 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Jan Steemann 5631314bc7 issue #212: added auto-increment support for collections 
the feature can be used by creating a collection with the extra `keyOptions`
attribute as follows:

    db._create("mycollection", { keyOptions: { type: "autoincrement", offset: 1, increment: 10, allowUserKeys: true } });

The `type` attribute will make sure the keys will be auto-generated if no `_key` attribute is specified for a document.
The `allowUserKeys` attribute determines whether users might still supply own `_key` values with documents or if this
is considered an error.
The `increment` value determines the actual increment value, whereas the `offset` value can be used to seed to value
sequence with a specific starting value. This will be useful later in a multi-master setup, when multiple servers can use
different auto-increment seed values and thus generate non-conflicting auto-increment values.

The default values currently are:

- `allowUserKeys`: `true`
- `offset`: `0`
- `increment`: `1`

The only other available key generator type currently is `traditional`. The `traditional` key generator
will auto-generate keys in a fashion as ArangoDB always did (some increasing integer value, with a more or less unpredictable
increment value).

Note that for the `traditional` key generator there is no the option to disallow user-supplied keys and give the
server the sole responsibility for key generation.
 2013-03-08 11:54:03 +01:00
Jan Steemann 424ab3e759 removed redundant function 2013-03-07 01:30:34 +01:00
Jan Steemann a716f300a1 less strlen() calls 2013-03-07 00:58:08 +01:00
Jan Steemann a73d32c553 initialise lists to the correct size 2013-03-07 00:46:27 +01:00
a-brandt e41847c336 moved random generators and nonce functions to internal and crypto module 2013-03-04 16:18:00 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
Frank Celler a79279445a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-26 18:20:27 +01:00
Jan Steemann ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Frank Celler 85d2e87154 added new package option 2013-02-25 18:15:32 +01:00
Frank Celler 1b69e1bb6c regenerated files 2013-02-21 14:27:31 +01:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
 2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 3fdebb38ee issue #393, issue #128 
Added a REST API for user management
The REST API exposes the functionality available in module "users" for HTTP access.

The following methods are available:
* GET /_api/user/username: fetch user information
* POST /_api/user: create new user
* PUT /_api/user: replace an existing user
* PATCH /_api/user: (partially) update an existing user
* DELETE /_api/user: remove an existing user

Additionally, a module "crypto" is introduced and exposed for Javascript actions.
The crypto module provides the following functions:
* require("org/arangodb/crypto").md5();
* require("org/arangodb/crypto").sha256();
* require("org/arangodb/crypto").rand();
 2013-02-20 11:56:26 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann 382047dbd6 issue #404 2013-02-18 14:28:19 +01:00
Frank Celler 78ba7acb17 generated files 2013-02-15 13:22:02 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Frank Celler 9bf9862f2b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-09 13:15:34 +01:00
Frank Celler 8cca06127c moved .dox to .md 2013-02-09 13:15:28 +01:00
a-brandt 4daf9d618b added "v8::V8::LowMemoryNotification()" before "while (!v8::V8::IdleNotification())" to trigger V8 GC 2013-02-08 14:20:12 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Frank Celler 6bd4bc5525 client side graph 2013-01-29 14:15:35 +01:00
Jan Steemann 17098dd4ef added support for HTTP OPTIONS method, pt 1 2013-01-25 19:11:33 +01:00
Jan Steemann 9a003247d0 removed the _bidirectional attribute for edges 
This will be reimplemented later on collection, and not on individual edges level.
Lucas & the others were sure directed & undirected edges should not be mixed in the same collection
 2013-01-18 17:02:30 +01:00
Frank Celler 61c6433c1c fixed building of html/admin/js files 2013-01-18 10:27:25 +01:00
Jan Steemann 52309cf188 fixed tests & segfault during tests 2013-01-18 00:58:14 +01:00
Frank Celler 670dc221ab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/client/client.js
	js/common/bootstrap/module-internal.js
	js/common/modules/org/arangodb/simple-query-common.js
	js/server/ahuacatl.js
 2013-01-17 23:56:31 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
Jan Steemann 913480e881 make revision ids strings so they do not clip in clients that do not support 64 bit integers 2013-01-17 15:02:55 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
 2013-01-10 18:00:25 +01:00
Frank Celler 03f85fae23 added 'any' call for collections 2013-01-10 10:39:43 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann 09e204651e issue #329 pt 2 2012-12-21 23:58:44 +01:00
Jan Steemann 8f5e50f750 do not execute scripts 2012-12-21 23:55:03 +01:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann 9155b400c2 some fixes for readline 2012-12-18 12:25:04 +01:00
Jan Steemann e5ad8f6612 ifdef for readline version 2012-12-18 11:43:11 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00
Jan Steemann 9481e588db fixed index access by id only 2012-11-28 13:37:33 +01:00
Jan Steemann cbad6b526a make collections accesible via name instead of id. 
this allows using the collection name instead of ids in _from, _to, _id etc.
 2012-11-28 13:16:15 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann 5a14e6904b fixed readline ambiguous completion on Ubuntu 2012-11-23 23:33:40 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann e3ea632773 issue #289 2012-11-22 10:32:29 +01:00
Jan Steemann a0fd0f6c87 issue #289 2012-11-22 10:30:12 +01:00
Jan Steemann ecbebaa60e issue #289 2012-11-22 10:21:58 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Jan Steemann 3009bdfcfd issue #277 2012-11-15 22:55:59 +01:00
Jan Steemann fe7e061a27 transaction nesting 2012-11-15 18:14:20 +01:00
a-brandt 71d3d54de1 collection info struct changed 2012-11-15 11:24:35 +01:00
Jan Steemann f483e9c41c added threadNumber global variable 2012-11-12 09:45:38 +01:00
Jan Steemann 6b6b692592 cleaned up v8 function creation 2012-11-12 09:30:51 +01:00
Jan Steemann d7aa6d7d0a more cleanup 2012-11-09 18:42:07 +01:00
Jan Steemann e657f9d6b4 made "_vertices" a shared string 2012-11-06 19:35:51 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
Jan Steemann 1576ed4ba0 change result output of bidirectional edges 2012-10-25 18:07:10 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Jan Steemann 1e50b4fcf9 issue #265 2012-10-24 12:54:10 +02:00
a-brandt 8256985a87 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-24 12:43:19 +02:00
Jan Steemann 5e89667d4a issue #265 2012-10-24 12:41:29 +02:00
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
 2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Jan Steemann d4cb1b5399 issue #262: more verbose error messages when loading broken modules 2012-10-22 16:21:04 +02:00
Jan Steemann 6796b9516b issue #262: more verbose error messages when loading broken modules 2012-10-22 16:20:07 +02:00
Frank Celler 62942eb028 adding generating files 2012-10-22 11:54:42 +02:00
Jan Steemann e291764fa8 less CPU bashing in SYS_WAIT 2012-10-17 18:50:32 +02:00
Jan Steemann 7fc079d30a merge several fixes from devel into 1.1 2012-10-16 11:44:39 +02:00
Jan Steemann 634adedbf6 vastly improved error messages for end user 2012-10-15 22:52:50 +02:00
Jan Steemann a736f9994d add derived files 2012-10-15 10:23:10 +02:00
Jan Steemann bf3d14eb14 changed gitignore, added derived files 2012-10-15 09:36:50 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
 2012-10-11 23:18:55 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB 
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
 2012-10-11 15:19:44 +02:00
Jan Steemann 9ffc7a7cfd fix memory zone issues 2012-10-10 23:49:18 +02:00
Jan Steemann 13e0ab010b derived file committed 2012-10-08 15:49:55 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 3b5d4a4fc9 issue #204: allow import of tab-separated values 
this enables the user to specify the tab as separator for arangoimp.
the separator and eol values used by arangoimp can now also consist of
more than one character.

updated documentation and added test cases
 2012-09-30 01:38:32 +02:00
Jan Steemann 43b14d0254 fixed compile warnings when compiled with --disable-logger 2012-09-28 14:29:32 +02:00
Jan Steemann fe8ba2357c removed debug flag 2012-09-28 08:58:30 +02:00
Jan Steemann 7500ed1137 fixed memleak for weak dictionary 2012-09-27 14:58:35 +02:00
Jan Steemann d3af4e04d3 typecast before delete 2012-09-27 13:53:34 +02:00
Jan Steemann 0a4282ebef fixed mismatched free/delete for WeakDictionary 2012-09-27 13:46:47 +02:00
Oreste Panaia a4d551653d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 19:11:18 +08:00
Oreste Panaia ba63b36b53 With git you never know 2012-09-26 19:10:48 +08:00
a-brandt 04308d6cb6 bugfix: zero length strings 2012-09-26 09:26:58 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Frank Celler 4181fd5cc4 regenerated files 2012-09-21 17:44:25 +02:00
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
 2012-09-20 16:39:59 +02:00
Jan Steemann b682fa0fdb compiled with Bison 2.5 2012-09-19 09:29:55 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
a-brandt 73d2c59836 bug fix: empty strings 2012-09-17 10:47:41 +02:00
a-brandt 4e2cbfbb15 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 09:51:21 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Frank Celler 9212351c13 added path and prefix 2012-09-16 17:25:38 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
a-brandt 1e98579792 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 10:14:32 +02:00
Jan Steemann 4790d0311c removed some unneeded globals 2012-09-14 09:34:43 +02:00
a-brandt ccdc384fdf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	lib/BasicsC/strings.c
 2012-09-13 16:45:05 +02:00
a-brandt 4dc64a546b added utf8 normalization function (uses icu) 2012-09-13 16:41:00 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
 2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann 28bb0da87f issue #195: added SYS_SAVE() function to save files 2012-09-12 21:52:04 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann 24933367e2 fixed doxygen error 2012-08-14 16:00:21 +02:00
Frank Celler e78f7f5a3e fixed doc 2012-08-10 15:30:31 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler c9673e08b3 added internal.wait 2012-08-08 15:33:11 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script 
renamed --unit-tests to --javascript.unit-tests
 2012-07-15 00:50:05 +02:00
Frank Celler 2c9d3ded48 regenerated files 2012-06-24 20:44:51 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00