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

9373 Commits

Author SHA1 Message Date
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 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
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
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
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
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
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
Michael Hackstein 5bf4714ce0 Fixed merge conflict in karma.conf 2013-12-16 16:42:44 +01:00
Michael Hackstein 490417de31 Started with adding a context menu for nodes. Modified karma config. It now does not run JSLint and WebWorkers specific tests, they somhow fail on the jenkins server. Will be fixed again 2013-12-16 16:41:24 +01:00
Frank Celler 85c780fbbe added icon path and more nsis info 2013-12-16 12:18:02 +01:00
Frank Celler 99c79485e8 added firefox 2013-12-16 11:14:27 +01:00
Michael Hackstein 08fc5db114 GraphViewer readed pannign buttons, got deleted by accident 2013-12-13 23:16:34 +01:00
Michael Hackstein b7a34326f9 GraphViewer Added a context menu for edges 2013-12-13 23:14:28 +01:00
Jan Steemann ecd45227e0 fixed mrb client 2013-12-13 18:01:21 +01:00
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