1
0
Fork 0
Commit Graph

9655 Commits

Author SHA1 Message Date
Frank Celler 7ee65976b5 added generated conf file 2013-12-22 15:47:25 +01:00
Frank Celler 2f28530bcc wrong prototype, wrong destroy 2013-12-22 15:41:15 +01:00
Frank Celler 2e3956856e generated files 2013-12-22 14:59:37 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Frank Celler e30725e22d more file path normalisation 2013-12-22 13:27:33 +01:00
Frank Celler 9b49d60b0a fixed concatenate files 2013-12-22 12:45:54 +01:00
Frank Celler 83d49223d5 added readme for windows 2013-12-22 11:34:05 +01:00
Frank Celler 2d5a8eb5ca added service functions 2013-12-22 00:48:31 +01:00
Frank Celler 2d9f8e3986 removed --daemon and --supervisor for Windows 2013-12-21 13:29:55 +01:00
Frank Celler 87cc2c4104 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-21 13:10:15 +01:00
Frank Celler 4f0d9f5b71 install Windows binaries all in bin 2013-12-21 13:10:08 +01:00
Frank Celler 12fcc9a025 added TRI_LocateInstallDirectory 2013-12-21 13:09:44 +01:00
Frank Celler e57dceb42b arangod used same config as binary name 2013-12-21 01:36:25 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +01:00
Jan Steemann 16e16f705c some bugfixes for asyncRequest etc 2013-12-20 18:03:55 +01:00
Jan Steemann 5a3b49a7bc fixed r/w deadlock 2013-12-20 16:27:54 +01:00
Jan Steemann c460ab97e9 applied changes from devel branch 2013-12-20 15:40:56 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2013-12-20 15:35:50 +01:00
Jan Steemann 02d22048be updated CHANGELOG 2013-12-20 15:24:56 +01:00
Jan Steemann 4efb291420 Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 2013-12-20 15:15:33 +01:00
Jan Steemann 834f3dfe94 Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4
Conflicts:
	CHANGELOG
2013-12-20 15:14:04 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Frank Celler 2651f7bae5 added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory 2013-12-20 10:39:50 +01:00
Frank Celler b2d60817dd added NL and CH 2013-12-19 17:18:29 +01:00
Frank Celler 56a8f0277f use home directory function 2013-12-19 16:32:08 +01:00
Frank Celler b0a43ea575 added move constructor 2013-12-19 16:27:02 +01:00
Max Neunhoeffer 7f2241ae20 Rearrange locking look in sending thread. 2013-12-19 16:24:15 +01:00
Max Neunhoeffer 5c80816352 Can do one roundtrip.
Client -REST-> Coordinator -> sendQueue -REST-> DBServer
         -> recvQueue -REST-> Client
2013-12-19 16:15:54 +01:00
Max Neunhoeffer a79c5801d8 Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
Max Neunhoeffer bfbbe18c57 Create a testing possibility for ClusterComm. 2013-12-19 11:33:34 +01:00
Frank Celler a82ef8b1ea fixed lock files for Windows 2013-12-19 11:26:38 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +01:00
Max Neunhoeffer b55c7e22f9 Basic queueing logic ready.
Actual sending still todo.
2013-12-19 09:06:45 +01:00
Jan Steemann 5d5035ed3a fixed JS error 2013-12-18 16:24:03 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Michael Hackstein ec83539390 The start view of the graph viewer now offers support for multiple label/colour attributes 2013-12-18 09:36:05 +01:00
Max Neunhoeffer 32f49d3c09 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/Cluster/ClusterComm.cpp
2013-12-18 08:52:10 +01:00
Michael Hackstein bf520f652f GraphViewer it is now possible to define a list of label attributes and colour attributes 2013-12-17 23:25:06 +01:00
Jan Steemann cd1ab21177 do not spam my logs please 2013-12-17 15:42:27 +01:00
Max Neunhoeffer 975f6b19fa Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2013-12-17 13:52:41 +01:00
Max Neunhoeffer fdc664859c Add skeletons of new functions. 2013-12-17 13:52:31 +01:00
Jan Steemann 8fa172f03c added callbacks for async requests 2013-12-17 13:51:07 +01:00
Max Neunhoeffer 9c4a25670e Start the background thread for ClusterComm. 2013-12-17 11:42:01 +01:00
Michael Hackstein d3be3c37b8 GraphViewer: Nodes can now be coloured by a list of attributes also. Still Missing Interface 2013-12-17 11:04:05 +01:00
Max Neunhoeffer e84a9fe3ca Finalise public interface for ClusterComm library. 2013-12-17 10:44:16 +01:00
Michael Hackstein 521314c73a The nodeshaper will now cut down long word labels. Also it is able internally use an array of label attributes. TODO: Add list to colours and offer interface for it 2013-12-17 09:57:40 +01:00
Michael Hackstein 3be384a624 Fixed all karma tests (especially JSLint in Browsers). Problem is that i had a test checking for location.replace which did fail but pointed the browser to some undefined location instead 2013-12-17 09:06:46 +01:00
Michael Hackstein 736a00449b Added some more style to the context menu. Now looks like a list of normal buttons 2013-12-16 17:31:50 +01:00
Michael Hackstein d71cdae36b Added context menu to edges. Started with styling. Needs some more love 2013-12-16 17:31:14 +01:00