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

3450 Commits

Author SHA1 Message Date
Heiko Kernbach acde0fed28 css shell fix 2012-11-15 15:07:53 +01:00
Jan Steemann fddcea9d4e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Utils/Collection.h
 2012-11-15 13:59:54 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
a-brandt 407ac48821 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-15 11:25:22 +01:00
a-brandt 71d3d54de1 collection info struct changed 2012-11-15 11:24:35 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 00c9955ed2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-14 17:14:11 +01:00
Jan Steemann 9e40045025 changed document CRUD API signatures 2012-11-14 17:11:16 +01:00
a-brandt 3e302a5aea changed function TRI_IsAllowedCollectionName 2012-11-14 14:09:00 +01:00
a-brandt 7a7136f083 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-14 13:46:16 +01:00
Jan Steemann f440f4d54c forgot to adjust makefile 2012-11-14 13:42:07 +01:00
a-brandt 8fa0869fa9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-14 13:36:01 +01:00
a-brandt cf89b42da9 added missing url decode and utf8 normalize 2012-11-14 13:35:20 +01:00
Jan Steemann 897a086649 renamed parameters 2012-11-14 13:28:04 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann cdd163cc8a added TRANSACTION() JS function 2012-11-13 18:45:27 +01:00
Jan Steemann 57f0677d7b split self-contained transactions into read & write transactions 2012-11-13 17:56:13 +01:00
Jan Steemann 39b407a038 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-13 17:36:37 +01:00
Jan Steemann b8655965f4 some transaction changes 2012-11-13 17:36:24 +01:00
Frank Celler a128bb998b added ruby path 2012-11-13 16:59:28 +01:00
Frank Celler a138874b52 added configure to AUTOMAGIC files 2012-11-13 16:27:16 +01:00
Frank Celler efdad9df10 add maintainer and automagic files 2012-11-13 16:18:23 +01:00
Frank Celler bec6e7343b create modules directory 2012-11-13 16:09:57 +01:00
Frank Celler 4804f2b324 fixed arangoirb compile error 2012-11-13 15:57:38 +01:00
Frank Celler 19d4125e80 fixed issue #275: strange error message in arangosh 1.0.3 at startup 
Conflicts:
	CHANGELOG
	js/common/bootstrap/js-modules.h
 2012-11-12 17:50:51 +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 6df8dd6fa0 issue #274 - added test case to check web interface presence 2012-11-12 08:59:22 +01:00
Jan Steemann d7aa6d7d0a more cleanup 2012-11-09 18:42:07 +01:00
Jan Steemann be39dbd419 some cleanup 2012-11-09 17:50:07 +01:00
Jan Steemann 0c732dfc69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-09 17:30:41 +01:00
Jan Steemann 728dfa3d9e fixed a few out of memory situations 2012-11-09 17:30:28 +01:00
Heiko Kernbach ca10aa3618 some css fix 2012-11-09 17:03:53 +01:00
Heiko Kernbach 38c7f825c0 ui fixes 2012-11-09 16:56:35 +01:00
Heiko Kernbach 301b5fc0d8 css fixes 2012-11-09 16:50:00 +01:00
Heiko Kernbach 68a2f2117f Revert " css fixes" 
This reverts commit 66534df409b4a34e955c1f0c24f8f9a802594d48.
 2012-11-09 16:31:19 +01:00
Heiko Kernbach 4ea6c62294 css fixes 2012-11-09 15:56:29 +01:00
Jan Steemann 419456c1a8 some refactoring 2012-11-09 15:06:28 +01:00
Jan Steemann b9019329c8 fail gracefully on invalid marker types 2012-11-09 11:05:06 +01:00
Jan Steemann 65db6eee8b some simplification 2012-11-09 11:03:42 +01:00
Jan Steemann 7dfab2d6dc introduced validFrom, still does nothing 2012-11-09 10:42:06 +01:00
Jan Steemann b4ae789573 cleaned up naming 2012-11-08 19:01:05 +01:00
Jan Steemann bef21db8d8 renamed variable 2012-11-08 18:47:39 +01:00
Jan Steemann b7b2c87ea8 re-used function declaration functions in v8-query 2012-11-08 18:44:10 +01:00
Jan Steemann 149c6c1fc1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-08 17:47:53 +01:00
Jan Steemann 64c6bc5cb0 renamed marker member _deletion to _validTo, some cleanup 2012-11-08 17:47:18 +01:00
Jan Steemann 5b4f8431b4 removed unused _eid from master pointer 2012-11-08 16:36:08 +01:00
a-brandt 8532aecd73 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-08 16:24:43 +01:00
a-brandt cc919edc69 bug fix negative _key 2012-11-08 16:23:09 +01:00
Jan Steemann 30e29ee0b1 removed unnecessary function parameters 2012-11-08 16:14:34 +01:00