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

4201 Commits

Author SHA1 Message Date
Frank Celler 7226c41ca6 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/system/api-collection.js
 2013-01-05 11:21:24 +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 ba26708f94 moved to actions.errors 2013-01-05 11:15:40 +01:00
Frank Celler 0747d3703e Merge branch 'issue317' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
 2013-01-05 10:41:39 +01:00
Frank Celler 0485299af5 issue 317 2013-01-05 10:39:27 +01:00
Jan Steemann 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 6dce10de80 slightly fixed the print function for arrays & objects 2013-01-04 15:50:55 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +01:00
Jan Steemann 8128a6377d memory-collections, intermediate commit 2013-01-04 12:12:46 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 1c1106d825 fixed names 2013-01-03 18:45:44 +01:00
Frank Celler d1a1ab462a fixed typo 2013-01-03 17:45:54 +01:00
Frank Celler 06e191877a added jslint target 2013-01-03 17:45:35 +01:00
Jan Steemann 741bcaf97f some more HTML cleanup 2013-01-03 17:39:31 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 79360ea164 more exports 2013-01-03 17:15:20 +01:00
Frank Celler 85b84d21b2 fixed jslint errors 2013-01-03 17:15:03 +01:00
Frank Celler 8564443078 delete is remove 2013-01-03 17:14:03 +01:00
Frank Celler 3d7e0b02b2 renamed "shell" to "emergency console" 2013-01-03 17:13:37 +01:00
Jan Steemann f2ceb8d734 some more layout frickeling 2013-01-03 17:07:22 +01:00
Jan Steemann a63ba7add4 a bit of UI frickeling 2013-01-03 16:41:22 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Jan Steemann 63805cf84c a few small fixes for logging 2013-01-03 14:47:16 +01:00
Jan Steemann 132143289d a few small fixes for logging 2013-01-03 14:45:56 +01:00
Jan Steemann c23b730347 reduce memory usage for small collections 2013-01-03 11:25:28 +01:00
Jan Steemann 1a339bfee4 fixed version number 2013-01-03 10:55:06 +01:00
Jan Steemann e2efd9d35e remove memory usage for small collections 2013-01-03 10:54:44 +01:00
Frank Celler c982962fd4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2013-01-03 09:07:14 +01:00
Jan Steemann 9bb15dcf45 issue #337 2013-01-02 18:56:08 +01:00
Jan Steemann c528423829 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2013-01-02 18:53:09 +01:00
Jan Steemann 1cd0404798 updated CHANGELOG 2013-01-02 18:52:45 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann 5349805220 issue #338 2013-01-02 17:22:08 +01:00
Frank Celler f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann ed19fccc65 fixed clang compile warnings 2013-01-02 16:17:26 +01:00
Jan Steemann f0aa0a8dd6 issue #338 2013-01-02 15:44:53 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Frank Celler 1357ab6c54 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2013-01-02 14:53:13 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann 74f9ced94e issue #335 2013-01-02 14:37:46 +01:00
Jan Steemann 19f459331d issue #335 2013-01-02 14:25:19 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Jan Steemann 6085ef9619 fixed doxygen error, added comment 2013-01-02 13:40:47 +01:00
Jan Steemann 926e8086c4 issue #336 2013-01-02 13:40:34 +01:00
Jan Steemann 47dea31254 issue #336 2013-01-02 13:29:39 +01:00
Jan Steemann 300289d662 issue #327 2013-01-02 11:57:48 +01:00
Jan Steemann 2dbece18e2 issue #327 2013-01-02 11:51:14 +01:00
Jan Steemann c77bcfb385 issue #339 2013-01-02 10:37:10 +01:00
Jan Steemann cc304beca9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-02 10:28:53 +01:00