1
0
Fork 0
Commit Graph

751 Commits

Author SHA1 Message Date
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
Jan Steemann e0da93737a issue #757 2014-02-05 09:11:20 +01:00
Jan Steemann 6bb4f0f0ac added SKIPLIST AQL function
Conflicts:
	CHANGELOG
2014-02-03 16:54:35 +01:00
Jan Steemann 545742a5fd added option `--server.disable-authentication-unix-sockets`
with this option, authentication can be disabled for all requests coming
in via UNIX domain sockets, enabling clients located on the same host as
the ArangoDB server to connect without authentication.
Other connections (e.g. TCP/IP) are not affected by this option.

The default value for this option is `false`.
Note: this option is only supported on platforms that support Unix domain
sockets.
2014-02-02 00:22:07 +01:00
Max Neunhoeffer c2e6c16395 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 19:34:55 +01:00
Jan Steemann 5e7716360c enhanced traversal documentation with custom expander examples 2014-01-31 19:31:31 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Jan Steemann 6fb1f45d0b removed unused doxygen options 2014-01-30 19:17:26 +01:00
Jan Steemann bcbcb3d6ea updated documentation 2014-01-30 19:12:37 +01:00
Jan Steemann 4f3070715c implemented first() and last() 2014-01-30 19:11:48 +01:00
Jan Steemann 0a2d61a42a added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc. 2014-01-28 01:51:27 +01:00
Frank Celler e26de15a56 BNAVIGATE 2014-01-27 14:59:56 +01:00
Jan Steemann 1500318dd4 fixed documentation errors 2014-01-27 14:50:17 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
2014-01-24 14:50:09 +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 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
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 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +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
Jan Steemann bfb076dded some more notes on importing edges and attribute meanings 2014-01-18 01:47:03 +01:00
Jan Steemann 259b748e22 some more notes on importing edges and attribute meanings 2014-01-18 01:44:51 +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 9f69aae986 issue #736: AQL function to parse collection and key from document handle 2014-01-17 22:39:04 +01:00
Frank Celler 0ddf9996d8 fix indentation 2014-01-17 11:33:31 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	GNUmakefile
	Makefile.in
	VERSION
	arangod/V8Server/ApplicationV8.cpp
	build.h
	configure
	configure.ac
	js/actions/api-foxx.js
	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/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	lib/BasicsC/locks-win32.c
2014-01-16 08:53:31 +01:00
Jan Steemann e68a98e837 fixed Doxygen errors
Conflicts:
	Documentation/InstallationManual/Installing.md
	lib/BasicsC/locks-win32.c
2014-01-15 18:15:22 +01:00
Jan Steemann 69a6e6449e fixed Doxygen errors 2014-01-15 18:06:07 +01:00
Frank Celler c0bf43d641 added ARANGODB_CONFIG_PATH 2014-01-15 14:27:01 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Martijn Teigeler 6a7f79bec4 Fixed type modules -> _modules
Added slash to path example
2014-01-11 12:01:27 +01:00
Martijn Teigeler 80467f9909 Fixed type modules -> _modules
Added slash to path example
2014-01-10 13:43:20 -04:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	utils/Makefile.files
2014-01-10 17:41:52 +01:00
Jan Steemann 13baa4d055 removed --cluster.heartbeat-interval, moved value to ETCD 2014-01-07 12:09:38 +01:00
Frank Celler 5455f2eeee release version 1.4.5-rc1 2014-01-03 15:00:51 +01:00
Max Neunhoeffer 2a0c85bc07 Finish documentation of ClusterComm test API call.
Also fix bug in synchronous mode test.
2014-01-03 11:36:05 +01:00
Frank Celler c875973909 Merge commit '65b6417' into devel 2013-12-31 16:36:49 +01:00
Frank Celler e74c972863 fixed drivers url 2013-12-31 16:36:30 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 8708dc7e70 renamed sharding to cluster 2013-12-10 09:56:00 +01:00
Jan Steemann c7824ac934 new CSS from Claudius 2013-12-07 18:56:01 +01:00
Jan Steemann dc88db3545 added extra notes about Foxx deployment 2013-12-04 23:49:14 +01:00
Jan Steemann 9593af0334 some more text for the user manual overview page 2013-12-04 23:20:38 +01:00
Jan Steemann e399cd41fd new CSS from Claudius 2013-12-04 10:17:51 +01:00
Jan Steemann 6ea120ada6 issue #695: arangosh server.password error
Documentation is fixed
2013-12-02 13:13:51 +01:00