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

2603 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 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 79360ea164 more exports 2013-01-03 17:15:20 +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
Jan Steemann c77bcfb385 issue #339 2013-01-02 10:37:10 +01:00
Jan Steemann 908fcc8acd issue #339 2013-01-02 10:28:44 +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
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 013fea7d01 added missing function referenced by simple query API 2012-12-05 18:44:35 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure 
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
 2012-12-03 13:02:59 +01:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +01:00
Jan Steemann 67c0ac2e2c issue #262 2012-10-25 10:57:51 +02:00
Jan Steemann bbd3dc8e23 issue #262 2012-10-25 10:57:26 +02:00
Jan Steemann 785d602fa0 remove invalid file 2012-10-24 11:55:15 +02:00
Jan Steemann 5a465a1763 more verbose action debugging 2012-10-24 11:54:40 +02:00
Jan Steemann e28a6625ef more verbose action debugging 2012-10-24 11:54:14 +02:00
Jan Steemann 85a81a2e04 another bugfix 2012-10-24 10:11:06 +02:00
Jan Steemann b95831c906 another bugfix 2012-10-24 10:10:41 +02:00
Jan Steemann 95c9c85608 documentation update 2012-10-24 09:39:39 +02:00
Jan Steemann 6e2e340c41 documentation update 2012-10-24 09:38:46 +02:00
Jan Steemann 39afb5e1a0 initialise variable 2012-10-23 18:51:22 +02:00
Jan Steemann c3f84cb2a6 initialise variable 2012-10-23 18:50:34 +02:00
Jan Steemann a422f005b6 updated documentation and error messages 2012-10-23 17:03:21 +02:00
Jan Steemann d4a116525b some documentation and error message updates 2012-10-23 17:02:31 +02:00
Jan Steemann f64bfd9240 also add other system collection 2012-10-22 16:46:28 +02:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +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
Frank Celler d1728b8920 fixed undefined vs delete attributes 2012-10-01 13:11:05 +02:00
Frank Celler 049009ba5a a string as action is mapped to a prefix controller 2012-10-01 12:39:11 +02:00
Frank Celler 50c2963897 create _routing if not present 2012-10-01 11:49:09 +02:00
Frank Celler faad04c8b3 switch options and next 2012-10-01 11:46:06 +02:00
Frank Celler db4d31cd94 fixed jslint issures 2012-09-29 16:39:58 +02:00
Frank Celler aeb83e4435 ssue #165: front-end application howto 2012-09-29 16:03:32 +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
Frank Celler a67bb18f72 return 5xx if not implemented 2012-09-19 15:33:43 +02:00
Frank Celler 8f5b31177b added redirect 2012-09-18 16:33:16 +02:00
Frank Celler 2ce0c4336a added module in database 2012-09-18 15:07:57 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +02:00
Frank Celler 4f6762436c added first go at user actions 2012-09-16 17:25:57 +02:00
Frank Celler 21eb612376 first version of new actions module 2012-09-15 19:16:36 +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 d602942925 preparation for issue #110: added HTTP patch method 2012-08-20 13:50:24 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Jan Steemann cfccab47eb issue #100: "count" attribute exists in cursor response with "count: false" 2012-06-06 09:54:39 +02:00
Frank Celler 86fcb881e9 fixed === and !== and == and != 2012-05-25 15:33:35 +02:00
Frank Celler b2d521ee35 cleanup action queues 2012-05-25 14:28:27 +02:00
Frank Celler 1e3ab217f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-05-25 00:26:50 +02:00
Frank Celler 67e5ea65b3 console is now a module 2012-05-24 23:59:53 +02:00
Jan Steemann 9d5e80b5b0 double the throughput for simple AQL queries by returning the result set as V8 list instead of a cursor 2012-05-24 12:24:23 +02:00
Frank Celler dd92df134c sk doc 2012-05-21 18:28:00 +02:00
Frank Celler b682357901 added skip list queries 2012-05-21 17:19:17 +02:00
Jan Steemann ab41fc94ae added comments 2012-05-16 19:33:08 +02:00
Jan Steemann a35f492b7f added hash index access for for loops 2012-05-15 13:42:15 +02:00
Frank Celler 56c53e5741 doc user-manual 2012-05-14 21:44:29 +02:00
Frank Celler c909ec20f3 more doc 2012-05-14 14:51:55 +02:00
Frank Celler 1f7d7ea334 fixed Web-Front-End access via / 2012-05-13 15:18:21 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Frank Celler 70d636a2be fixed firstExample 2012-05-10 20:30:40 +02:00
Frank Celler e1cd69d515 fixed hash 2012-05-10 20:14:49 +02:00
Frank Celler db46badb0f cleanup 2012-05-10 16:37:42 +02:00
Frank Celler 875746d0d4 fixed doc 2012-05-07 17:35:41 +02:00
Frank Celler 5c5f0827b3 fixed byExample and firstExample 2012-05-07 16:08:23 +02:00
Frank Celler f47788fea6 simple query 2012-05-06 20:05:59 +02:00
Frank Celler 4c6172bc64 fixed return code 2012-05-03 15:44:23 +02:00
Frank Celler 23a7adcefc doc and simple queries 2012-05-02 18:05:45 +02:00
Frank Celler cadca4a27b unittests 2012-05-02 17:05:38 +02:00
Frank Celler 1fe03b0642 doc and minor fixes 2012-05-02 13:53:30 +02:00
Frank Celler 8c872f00b9 more on simple queries 2012-05-01 23:50:40 +02:00
Frank Celler f96641fdef cursor 2012-05-01 21:51:33 +02:00
Frank Celler eea4c94b1a added constraint flag 2012-04-29 14:14:52 +02:00
Frank Celler 8fab9ca64c doc 2012-04-28 22:27:07 +02:00
Jan Steemann 70cf49f642 fixed query by example 2012-04-23 09:42:37 +02:00
Frank Celler 4625a6791d repaired constructor 2012-04-21 16:30:17 +02:00
Frank Celler 700fb4e5c5 fixed graph properties 2012-04-18 16:37:42 +02:00
Frank Celler 2d80ca4adc added select-by-example 2012-04-15 21:48:21 +02:00
Frank Celler 6156057f2a cleanup of documentation 2012-04-13 18:18:58 +02:00
Jan Steemann 1356641435 Merge branch 'master' of http://github.com/triAGENS/AvocadoDB 2012-04-03 00:26:00 +02:00
Jan Steemann be8ec0d3e6 fixed issues in key/value API and in simple-query API 2012-04-03 00:25:25 +02:00
Frank Celler 17d9f65ecf doc 2012-04-03 00:13:46 +02:00
Frank Celler 24569fa7d2 fixed JSON representation of indexes 2012-03-30 23:42:35 +02:00
Frank Celler 700ab897e9 started HTTP for indexes 2012-03-30 18:15:50 +02:00
Jan Steemann 4ae2ea3ae7 merge with SVN 2012-03-30 14:30:41 +02:00
Frank Celler 27d7ba9fb8 more http api 2012-03-28 18:14:35 +02:00
Frank Celler 356d95a279 more tests for api-collection 2012-03-28 11:37:22 +02:00
Frank Celler 204522d465 merged with JAN 2012-03-28 11:18:43 +02:00
Frank Celler 84697d5f8c merged with JAN 2012-03-28 10:19:45 +02:00
Frank Celler 2a789cb0e3 create collection 2012-03-27 23:24:57 +02:00
Frank Celler 738799b70a more tests and delete 2012-03-27 22:24:44 +02:00
Frank Celler bd17cfab54 more _api/collection 2012-03-27 18:07:55 +02:00
Frank Celler 7ef0fe6119 fix wrong tests 2012-03-26 23:15:16 +02:00
Frank Celler 2bb58c386a merged 2012-03-20 09:35:10 +01:00
Frank Celler d4303479a8 rest tests 2012-03-18 21:28:57 +01:00
Frank Celler c64f76b701 started rewrite of rest interface 2012-03-16 17:58:30 +01:00
Frank Celler d4cd6585fa merged with jan 2012-03-14 17:54:59 +01:00
Frank Celler 3763193b1e documentation and actions 2012-03-14 11:54:19 +01:00
Frank Celler 5b28d68072 fixed layout and memory bug 2012-03-13 01:26:32 +01:00