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

9632 Commits

Author SHA1 Message Date
a-brandt 0550715088 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-24 14:50:45 +01:00
a-brandt 041b7f5daa added HAS and HAS_NOT 2014-01-24 14:49:50 +01:00
Jan Steemann 78d29b1503 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-24 14:37:24 +01:00
Jan Steemann b3df999f56 jshund 2014-01-24 14:37:16 +01:00
Michael Hackstein 42173af80d Finished implementing foxx upload in WI 2014-01-24 12:51:54 +01:00
Michael Hackstein c762f17b01 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-24 11:30:39 +01:00
Michael Hackstein 1192dcbf87 Fixed style of Foxx Importer 2014-01-24 11:30:32 +01:00
Jan Steemann ae6b4be148 upload applications via web interface 2014-01-24 11:15:17 +01:00
Michael Hackstein 93dc981252 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-24 10:25:00 +01:00
Michael Hackstein cb288e21e6 Start of Foxx download in WI implementation. Not functional yet 2014-01-24 10:24:31 +01:00
Frank Celler bec2a0e9ef fixed issue #741: documentation improvement 
Conflicts:
	Documentation/RefManual/Actions.md
	Documentation/UserManual/Foxx.md
	Documentation/UserManual/UserManual.md
 2014-01-23 23:14:48 +01:00
Frank Celler 3e71b2087e fixed issue #741: documentation improvement 2014-01-23 23:11:33 +01:00
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
Frank Celler d4301b03e6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-23 18:10:46 +01:00
Frank Celler 796a19397e removed skip lists 2014-01-23 18:10:40 +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 0e061e8735 updated CHANGELOG 2014-01-23 16:50:01 +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 c4c6500b9a updated man pages 2014-01-23 10:09:32 +01:00
Jan Steemann 587c2aef64 issue #744 
Conflicts:
	lib/ApplicationServer/ApplicationServer.cpp
 2014-01-23 09:58:18 +01:00
Jan Steemann a9b579f1b1 issue #744 2014-01-23 09:47:22 +01:00
Jan Steemann f5039a4f54 make usage of batch API easier 2014-01-21 17:56:49 +01:00
Jan Steemann 724c5baa70 issue #737: adjusted error message 2014-01-21 15:23:58 +01:00
Jan Steemann b63a8bdbce issue #737: adjusted error message 2014-01-21 15:23:26 +01:00
Jan Steemann 17c8de6560 updated CHANGELOG 
Conflicts:
	CHANGELOG
 2014-01-21 13:41:20 +01:00
Jan Steemann b5ba025c38 updated CHANGELOG 2014-01-21 13:40:38 +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
Jan Steemann 12dbcc535d updated import manual 2014-01-21 09:16:42 +01:00
Jan Steemann 5001709926 updated import manual 2014-01-21 09:15:45 +01:00
Frank Celler 251c2fa448 release version 1.4.6 2014-01-20 22:09:44 +01:00
Jan Steemann bfb076dded some more notes on importing edges and attribute meanings 2014-01-18 01:47:03 +01:00
Jan Steemann 2f20f8b75f slightly updated error messages 2014-01-18 01:46:48 +01:00
Jan Steemann 4f5052f469 issue #730: initial implementation of A* 2014-01-18 01:46:24 +01:00
Jan Steemann 259b748e22 some more notes on importing edges and attribute meanings 2014-01-18 01:44:51 +01:00
Jan Steemann 5c5b787e83 slightly updated error messages 2014-01-18 01:22:26 +01:00