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

909 Commits

Author SHA1 Message Date
Jan Steemann eda617fb09 fixed missing client-side implementation for isVolatile 2013-01-07 15:20:55 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Jan Steemann 36a3ebe2ae added comment about wait() 2013-01-07 09:44:54 +01:00
Frank Celler aa0d9d4e3e Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	js/server/server.js
 2013-01-05 12:38:09 +01:00
Frank Celler c91b7c0f14 fixed jslint errors 2013-01-05 11:59:01 +01:00
Frank Celler 24fc2d371e moved methods to ArangoCollection 2013-01-05 11:46:33 +01:00
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
Jan Steemann 6dce10de80 slightly fixed the print function for arrays & objects 2013-01-04 15:50:55 +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
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 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 f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +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 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
Jan Steemann 908fcc8acd issue #339 2013-01-02 10:28:44 +01:00
Jan Steemann b48d039e3f issue #327 2012-12-27 18:26:04 +01:00
Jan Steemann 110fb8ade6 issue #327 2012-12-27 18:14:19 +01:00
Jan Steemann e28d9b9a93 issue #327: fixed javascript parse errors 2012-12-27 18:05:02 +01:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann 599428859e issue #330 2012-12-21 22:01:51 +01:00
Jan Steemann 2b84d417f8 issue #330 2012-12-21 21:54:55 +01:00
Jan Steemann 443757df3b some tests for issue #325 2012-12-20 13:35:49 +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 7f93615dc6 issue #326 2012-12-19 17:22:01 +01:00
Jan Steemann dd906abbd3 issue #324 2012-12-18 19:04:45 +01:00
Jan Steemann 96637435ab fulltext: more query operators, more tests, more controlled memory usage and statistics 2012-12-18 14:56:06 +01:00
Jan Steemann dc3c479e71 potential fix for issue #315 2012-12-17 13:09:15 +01:00
Jan Steemann d07dfd9ee1 potential fix for #315 2012-12-17 13:06:18 +01:00
Jan Steemann 58686a8c2e issue #323 2012-12-17 10:18:46 +01:00
Jan Steemann 81d6146d02 issue #323 2012-12-17 10:16:26 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann cbaa57a1bd cleanup of fulltext indexes, resizing etc. 2012-12-07 18:00:01 +01:00
Jan Steemann c49ce0a52f fulltext resizing, still incomplete 2012-12-07 13:51:19 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Jan Steemann b5b431e815 some more tests 2012-12-07 09:08:58 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00