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

9393 Commits

Author SHA1 Message Date
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Heiko Kernbach 3f1ffd2d70 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 16:11:23 +01:00
Heiko Kernbach 040db09706 css, icons 2013-12-13 16:11:17 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Jan Steemann 21d5abf15d updated CHANGELOG 2013-12-13 16:06:14 +01:00
Heiko Kernbach f4e4e411cf icons 2013-12-13 16:01:07 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics 
Conflicts:
	CHANGELOG
 2013-12-13 16:00:02 +01:00
Jan Steemann 0a2e39085f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 15:59:15 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Heiko Kernbach 72a9d6f14f icons 2013-12-13 15:52:20 +01:00
Heiko Kernbach fc9038dcfa changed icons to new arango icon set 2013-12-13 15:44:09 +01:00
Heiko Kernbach 05976d1072 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 13:56:24 +01:00
Michael Hackstein 05a2baff05 The right-click context menu is now disabled in context of the SVG 2013-12-13 13:06:22 +01:00
Jan Steemann b624d42e2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 12:38:59 +01:00
Heiko Kernbach 839112dbad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 12:36:17 +01:00
Jan Steemann 865b70862e some minor adjustments for arangodump and arangorestore 2013-12-13 11:54:00 +01:00
Jan Steemann 69a462e785 some minor adjustments for arangodump and arangorestore 2013-12-13 11:52:52 +01:00
Michael Hackstein 8624ab3278 GraphViewer: Whenever the content of the adapter is reseted now the content of the colourmap is reseted as well 2013-12-13 11:43:33 +01:00
Michael Hackstein 07cc648b55 Fixed a test in the dispatcher that failed unpredictibly 2013-12-13 11:17:03 +01:00
Michael Hackstein 18d2c3327b GraphVieweri: the abstract Adapter now propagetes a cleanUp call to the general viewer. 2013-12-13 11:16:19 +01:00
Michael Hackstein bb1abbac72 GraphViewer: Implemented passing around the graphviewer object through adapters, required for reseting 2013-12-13 10:44:16 +01:00
Michael Hackstein e6df75784f GraphViewer Added tests for the graphViewer object ot be passed arround through adapter instances, which is required for reset 2013-12-13 10:43:23 +01:00
Michael Hackstein f024bf07a2 The Colourlist is now reseted whenever the user picks a different attribute for colouring 2013-12-12 17:00:14 +01:00
Frank Celler cb300f7964 fixed outline-regexp for xemacs and emacs 2013-12-12 12:11:11 +01:00
Frank Celler d1061d47c8 fixed outline-regexp for xemacs, needs to be tests on emacs again 2013-12-12 12:10:06 +01:00
Michael Hackstein 34b775086c Added test to reset the colourlist on attribute change 2013-12-12 09:43:37 +01:00
Heiko Kernbach 221b18a5e7 css fix 2013-12-12 08:46:08 +01:00
Michael Hackstein f04c25e051 Finally all GraphViewer Tests added and running under phantomjs and added to automatic test 2013-12-10 10:51:41 +01:00
Michael Hackstein 62e9a9d3d6 Fixed tests for arango ui component in graphviewer. It is now also added to PhantomJS test suite 2013-12-08 14:42:00 +01:00
Michael Hackstein cb854e8250 Fixed tests for modularityJoiner to run with phantomJS (different result because of different sorting order of object keys) 2013-12-08 13:23:34 +01:00
Frank Celler ef7e85053c added missing file 2013-12-07 19:16:38 +01:00
Frank Celler 108eed894a Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-07 19:14:21 +01:00
Frank Celler c61f39340a removed VS2012 stuff 2013-12-07 18:59:15 +01:00
Ferhat 85aefffba9 Update README.md 2013-12-07 18:56:20 +01:00
Ferhat ce8ab428b1 Update README.md 
Interesting and useful for researchers.
 2013-12-07 18:56:17 +01:00
Frank Celler 35af9593a4 fixed wrong path in install script 2013-12-07 18:56:14 +01:00
Jan Steemann 99b325ff1e better clone some objects returned by AQL user-defined functions 2013-12-07 18:56:10 +01:00
Jan Steemann 79d8ecbc4d make test more reliable 2013-12-07 18:56:07 +01:00
Jan Steemann 993d857afe allow references as function parameters 2013-12-07 18:56:04 +01:00
Jan Steemann c7824ac934 new CSS from Claudius 2013-12-07 18:56:01 +01:00
Frank Celler 6789e7da93 Vs2013 2013-12-07 18:55:58 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Frank Celler f6b40b3395 added memchr and timezone for windows 2013-12-07 18:55:51 +01:00
Jan Steemann 3631125721 fixed unreadable swagger documentation 2013-12-07 18:55:48 +01:00
Jan Steemann e620c91684 fixed issue #701: ArangoStatement undefined in arangosh 2013-12-07 18:55:45 +01:00
Jan Steemann 4e8ac196fd fixed typos in configuration files 2013-12-07 18:55:42 +01:00
Jan Steemann e4b9030b39 fixed typos in config files 2013-12-07 18:55:39 +01:00
Ferhat 118016a875 Update README.md 2013-12-06 18:34:47 +01:00
Ferhat a200e542c0 Update README.md 
Interesting and useful for researchers.
 2013-12-06 18:34:41 +01:00