1
0
Fork 0
Commit Graph

723 Commits

Author SHA1 Message Date
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
Jan Steemann 28110b01e3 issue #671: make more graph-methods work client-side, too 2013-11-25 10:23:46 +01:00
Jan Steemann 6cf0fa2b4a issue #671: make other graph methods work client-side, too 2013-11-25 10:22:36 +01:00
Frank Celler 1ce14d32b1 use :: 2013-11-23 16:38:50 +01:00
Frank Celler 70ba4a8697 use :: 2013-11-23 16:38:23 +01:00
Jan Steemann c0a9c65a32 Merge pull request #599 from triAGENS/foxx-manual
Foxx Documentation: Write an introduction
2013-11-21 06:53:10 -08:00
Frank Celler ee1f3bd322 example is handled in install
Conflicts:
	Makefile.in
2013-11-20 18:04:19 +01:00
Frank Celler 7bdcf0bd78 example is handled in install 2013-11-20 18:03:45 +01:00
Lucas Dohmen 366f393ad4 Foxx: Adjusted introduction according to @mchacki's idea
List instead of one sentence
2013-11-20 15:15:59 +01:00
Jan Steemann 439554de04 fix annoying error in case new directories are added to documentation 2013-11-20 13:50:18 +01:00
Frank Celler 9438b43f92 fixed issue #669 Tiny documentation update 2013-11-20 09:20:59 +01:00
Frank Celler fd268ef6ab fixed issue #669 Tiny documentation update 2013-11-20 09:18:15 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann 72aaacbb54 removed priority queues
this feature was never advertised nor documented nor tested.
2013-11-18 11:12:36 +01:00
Jan Steemann 8d19d2a424 fixed doxygen error 2013-11-18 10:54:27 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes
Conflicts:
	arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann 2995914cfa added JavaScript traversal documentation 2013-11-13 14:52:35 +01:00
Jan Steemann 6879da3133 added JavaScript traversal documentation 2013-11-13 14:51:54 +01:00
Jan Steemann 6946f827fd removed version number from tex/pdf manual 2013-11-08 15:24:24 +01:00
Jan Steemann b1823cf7f4 issue #660: updated documentation on indexes 2013-11-07 23:26:55 +01:00
Jan Steemann 4c6ac2dc0d issue #660: updated documentation on indexes 2013-11-07 23:26:05 +01:00
Jan Steemann e91de81471 added some info about potential pitfalls 2013-11-07 21:49:30 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann a977c5662a removed --database.force-sync-shapes option 2013-11-05 18:20:55 +01:00
Jan Steemann 9e78ab5af5 added NTH and POSITION 2013-11-04 18:24:03 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann 51a66e5521 issue #560: added information about how to deploy application from directory or zip file 2013-11-01 14:49:44 +01:00
Jan Steemann 33736b8e30 updated documentation 2013-11-01 14:49:18 +01:00
Jan Steemann c694ddf5fd issue #560: added information about how to deploy application from directory or zip file 2013-11-01 14:44:20 +01:00