1
0
Fork 0
Commit Graph

2798 Commits

Author SHA1 Message Date
Jan Steemann 6fa5f0fdc1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 13:32:36 +02:00
Jan Steemann f4adf94748 some simplification 2012-09-17 13:32:20 +02:00
Heiko Kernbach a213856b2e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-09-17 12:48:35 +02:00
Heiko Kernbach 3864f41856 changed statistics design 2012-09-17 12:48:13 +02:00
Jan Steemann b8cc79296b some simplification 2012-09-17 12:15:01 +02:00
Jan Steemann cc637aa091 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 11:55:16 +02:00
Jan Steemann 3d6dfb6042 indentation 2012-09-17 11:54:52 +02:00
Jan Steemann 76674bad52 moved primaryIndex and lock from document-collection to primary-collection 2012-09-17 11:43:48 +02:00
a-brandt 73d2c59836 bug fix: empty strings 2012-09-17 10:47:41 +02:00
Jan Steemann 1ef037ce8c renamed indexes to secondaryIndexes 2012-09-17 09:54:12 +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
Jan Steemann 7c4b13f19d slightly simplified locking 2012-09-17 09:05:13 +02:00
Jan Steemann 9698fba8aa removed session handler documentation 2012-09-14 15:41:56 +02:00
Jan Steemann 7d512be4bb make clean deletes more 2012-09-14 15:40:29 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 07ccc2083b further renamings 2012-09-14 14:57:26 +02:00
Jan Steemann b2e47ae2b8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 14:46:56 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
Oreste Panaia 305031a0f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 18:19:52 +08:00
Oreste Panaia c0e9f488c9 ruby unit tests for some index tasks 2012-09-14 18:18:57 +08:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
a-brandt 1e98579792 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 10:14:32 +02:00
a-brandt b26a96619c added NORMALIZE_STRING function 2012-09-14 10:13:53 +02:00
Jan Steemann 4790d0311c removed some unneeded globals 2012-09-14 09:34:43 +02:00
a-brandt fc2ab446fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 09:19:42 +02:00
Jan Steemann 1b6efb38d9 virtual 2012-09-14 08:47:56 +02:00
Frank Celler 5bdcbe715a fixed whitespace bug at beginning of function definition 2012-09-13 22:22:52 +02:00
Frank Celler 4cb179cad5 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-09-13 22:16:31 +02:00
Frank Celler 5ffae32016 fix path and removed duplicate const 2012-09-13 21:19:09 +02:00
Frank Celler 55a0ba2a29 added VC++ files 2012-09-13 21:15:09 +02:00
Jan Steemann a51fa9d4d9 fixed some doxygen errors 2012-09-13 20:08:18 +02:00
a-brandt db00ed1502 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:47:48 +02:00
a-brandt 8211d2ce3d added simple ICU enable file 2012-09-13 17:47:16 +02:00
Jan Steemann 967716a27b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:41:21 +02:00
Jan Steemann 1d865cddb1 removed unnecessary long waits 2012-09-13 17:41:00 +02:00
Jan Steemann a932d335cb added guards for collection locking and read/write transactions 2012-09-13 17:40:38 +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
Jan Steemann 93fc2e43a7 fixed a typo 2012-09-13 15:44:15 +02:00
Frank Celler 1d6bfbe4bc Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-09-13 15:09:25 +02:00
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +02:00
Jan Steemann 3deebd06de fixed authentication 2012-09-13 14:19:26 +02:00
Frank Celler 1bb5c801a2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-09-13 13:43:28 +02:00
Frank Celler 55824fa836 fixed issue #197: HTML web interface calls /_admin/user-manager/session 2012-09-13 13:42:53 +02:00
Jan Steemann e050e83120 removed PerfTests 2012-09-13 10:10:40 +02:00
Frank Celler f0161a539b removed JsonParserX 2012-09-13 09:46:10 +02:00
Frank Celler 5075e1f764 removed JsonParserX 2012-09-12 23:50:22 +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