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

2735 Commits

Author SHA1 Message Date
Frank Celler 6679995e76 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	Documentation/man/man1/arangob.1
	Documentation/man/man1/arangodump.1
	Documentation/man/man1/arangoimp.1
	Documentation/man/man1/arangorestore.1
	Documentation/man/man1/arangosh.1
	Documentation/man/man8/arango-dfdb.8
	Documentation/man/man8/arangod.8
	Documentation/man/man8/foxx-manager.8
	Documentation/man/man8/rcarangod.8
	Makefile.in
	VERSION
	aclocal.m4
	build.h
	config/config.guess
	config/config.sub
	config/missing
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/server/bootstrap/module-internal.js
	js/server/modules/org/arangodb/actions.js
	js/server/modules/org/arangodb/foxx/authentication.js
	js/server/modules/org/arangodb/foxx/manager.js
	lib/ApplicationServer/ApplicationServer.cpp
 2014-01-23 22:24:20 +01:00
Jan Steemann d55a5b156c added tests and documentation for issue #748 2014-01-23 17:22:19 +01:00
Frank Celler fdee836023 release version 1.4.7 2014-01-23 17:13:52 +01:00
Jan Steemann ab79b901e3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-23 16:49:11 +01:00
Jan Steemann 6ec73a5589 fixed reference to unused variable 2014-01-23 16:48:24 +01:00
Jan Steemann 733fd3ebd5 Merge branch 'devel' of https://github.com/dajester2013/ArangoDB into dajester2013-devel 2014-01-23 16:45:31 +01:00
Michael Hackstein ca6383b5ff Fixed minor css error 2014-01-23 16:42:55 +01:00
Michael Hackstein ed8a60226c Removed overspecified css entry 2014-01-23 16:41:12 +01:00
Jan Steemann d4227b32ef jshund 2014-01-23 14:57:54 +01:00
dajester2013 bc09265335 Update ahuacatl.js 
vertexFilterType -> vertexFilterMethod
 2014-01-23 06:02:30 -06:00
dajester2013 f99df3b6b0 Update ahuacatl.js 
followVertices changed to filterVertices
 2014-01-23 05:48:23 -06:00
dajester2013 1cad676170 Update ahuacatl.js 
fix indentation
 2014-01-23 05:46:34 -06:00
dajester2013 27806d90a8 traversal(_tree) vertex filtering 
added params "filterVertices" and "vertexFilterType" to traversal(_tree).  "filterVertices" accepts an array of examples similar to "followEdges", while "vertexFilterType" defines how to filter out vertices that do not match the examples. "vertexFilterType" can be set to "prune", "exclude", or (default) ["prune","exclude"].
 2014-01-23 05:45:28 -06:00
Jan Steemann 17c8de6560 updated CHANGELOG 
Conflicts:
	CHANGELOG
 2014-01-21 13:41:20 +01:00
Jan Steemann 2d4db0ea40 mount all system apps by name 2014-01-21 13:39:57 +01:00
Jan Steemann f6b872e01c updated CHANGELOG 2014-01-21 13:38:32 +01:00
Jan Steemann d10748155f follow up for issue #738 2014-01-21 13:31:01 +01:00
Jan Steemann f99f362f07 small improvement for issue #738 2014-01-21 13:30:38 +01:00
Alan Plum 3e653e303d Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-21 13:28:46 +01:00
Jan Steemann 0c039e0264 mount all system apps by name 2014-01-21 13:27:40 +01:00
Frank Celler 251c2fa448 release version 1.4.6 2014-01-20 22:09:44 +01:00
Jan Steemann 4f5052f469 issue #730: initial implementation of A* 2014-01-18 01:46:24 +01:00
Jan Steemann a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann 583878176b issue #736: AQL function to parse collection and key from document handle 
Conflicts:

	CHANGELOG
 2014-01-17 23:13:06 +01:00
Jan Steemann e99f813e0a follow up for issue #738 2014-01-17 22:58:43 +01:00
Jan Steemann 9f69aae986 issue #736: AQL function to parse collection and key from document handle 2014-01-17 22:39:04 +01:00
Jan Steemann ed08a41a11 small improvement for issue #738 2014-01-17 22:01:24 +01:00
Jan Steemann c0aa6157ff Merge branch 'globals-filename-dirname' of https://github.com/pluma/ArangoDB into devel 2014-01-17 21:41:44 +01:00
Alan Plum 371bba964b Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-17 21:31:16 +01:00
Jan Steemann 0bbbd53d4d added fm.rescan() method 
Conflicts:
	CHANGELOG
 2014-01-17 14:06:27 +01:00
Jan Steemann c7380398d9 added fm.rescan() method 2014-01-17 14:04:10 +01:00
Frank Celler d0c05f6628 fixed issue #734: foxx cookie and route problem 2014-01-16 14:16:47 +01:00
Frank Celler 87009c7e6e added missing db prefix 2014-01-16 14:08:45 +01:00
Frank Celler c2c574d828 added missing encoding 2014-01-16 14:08:28 +01:00
Jan Steemann 657406bb70 fixed jslint warnings 2014-01-15 18:15:38 +01:00
Jan Steemann f760d056df added startupPath value to result of /_api/foxx/config 
Conflicts:
	js/actions/api-foxx.js
 2014-01-15 18:10:26 +01:00
Jan Steemann db0c6dacae added test 2014-01-15 18:09:56 +01:00
Jan Steemann d8ac4046f8 added fm.configJson method 2014-01-15 18:07:47 +01:00
Jan Steemann 72902b2e62 fixed jslint warnings 2014-01-15 18:06:17 +01:00
Jan Steemann cfdbb1996e added startupPath value to result of /_api/foxx/config 2014-01-15 18:05:27 +01:00
Jan Steemann 231e277113 added fm.configJson method 2014-01-15 17:54:59 +01:00
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +01:00
Frank Celler 30252c1877 Merge pull request #731 from pluma/error-response-error-names 
Added support for error names instead of error types
 2014-01-14 00:27:39 -08:00
Jan Steemann f8c50ade6e force reloading of user functions 2014-01-13 17:50:36 +01:00
Jan Steemann 8ea145cd8f force reloading of user functions 2014-01-13 17:49:44 +01:00
Jan Steemann 50105fc0d9 fixed error in index documentation 2014-01-13 17:30:08 +01:00
Jan Steemann f3dd1431a8 Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 2014-01-13 17:26:20 +01:00
Jan Steemann 7458abceda fixed error in index documentation 2014-01-13 17:02:09 +01:00
Frank Celler 9a68feaa98 release version 1.4.5-rc2 2014-01-13 14:34:55 +01:00
Michael Hackstein 4bb630b030 Further additions to router tests 2014-01-12 22:05:41 +01:00