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

11605 Commits

Author SHA1 Message Date
Michael Hackstein 3349bfea42 Fixed a minor bug, wehn dispatcher and cluster are authenticated with different users 2014-03-06 16:41:18 +01:00
Max Neunhoeffer ee748eccbf Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-06 16:40:20 +01:00
Max Neunhoeffer 3c198365fc Do not run version-check.js at relaunch. 
Rationale: We cannot possibly know the right authentication
because the owner of the cluster might have changed the password.
Also, it is not necessary to run the script.
 2014-03-06 16:39:30 +01:00
Jan Steemann d8eb78fc04 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 16:37:10 +01:00
Jan Steemann b3b22a1f1c changed authentication procedure 2014-03-06 16:37:00 +01:00
Michael Hackstein 0db31a974d Fixed problems with Cluster Overview when cluster is authenticated. User needs zu supply a coordinator user 2014-03-06 16:24:28 +01:00
Esteban Lombeyda d416dda73a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 15:45:02 +01:00
Esteban Lombeyda 909697a4d5 simple batch script for compiling etcd 2014-03-06 15:39:15 +01:00
gschwab 43b0e8c692 css refactoring: deleted .thumbnails2 and appearences 2014-03-06 14:19:56 +01:00
Frank Celler f61194ceda moved cmake-setup to Makefile.am 2014-03-06 14:00:20 +01:00
Frank Celler f412ed510f added setup link 2014-03-06 13:59:49 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
gschwab 1978b38368 div-tag removed: duplicate 2014-03-06 10:49:01 +01:00
scottashton 00f8a79a48 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 10:39:13 +01:00
scottashton 034f244d8f added constants for chart types 2014-03-06 10:38:56 +01:00
Jan Steemann 84364a7601 fixed socket shutdown on Windows 2014-03-06 10:34:29 +01:00
Jan Steemann e9d2d555af renamed parameter to silence compilers 2014-03-06 10:34:13 +01:00
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
scottashton ff253d0e0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 09:22:39 +01:00
scottashton 7651740d87 fixed bug, detail chart title not showing after reload 2014-03-06 09:22:17 +01:00
Jan Steemann e70948a973 Merge pull request #775 from frankmayer/patch-2 
A few corrections to the text...
 2014-03-06 09:21:33 +01:00
scottashton 1ea001e538 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 08:37:18 +01:00
Frank Mayer 3c290a79ed A few corrections to the text... 
Made some minor corrections. Feel free to adopt as is, or pick only the ones you like ;)
 2014-03-05 22:26:47 +02:00
gschwab 199b8865f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 17:05:25 +01:00
gschwab decf96c38c missing closing div-tag inserted 2014-03-05 17:05:20 +01:00
scottashton 437dc5a668 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 16:46:00 +01:00
scottashton 28ef8d5d41 reduced history amount to 14 days 2014-03-05 16:45:57 +01:00
Jan Steemann b1e4554a85 fixed charting bug 2014-03-05 16:38:10 +01:00
scottashton 371c3a84f5 extracted dygraph config 2014-03-05 16:24:55 +01:00
Jan Steemann f5c761c766 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 15:50:36 +01:00
Jan Steemann fb4a445965 updated CHANGELOG 2014-03-05 15:50:23 +01:00
gschwab e827859715 fixed pagination - small refactoring 2014-03-05 15:47:24 +01:00
Jan Steemann 977cc755cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 15:34:00 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
gschwab 3dbf97226e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 14:58:11 +01:00
gschwab c30dceadda fixed pagination on logs 2014-03-05 14:58:04 +01:00
Jan Steemann 3d877549d6 fixed typo 2014-03-05 14:40:36 +01:00
Jan Steemann 569fd6386e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 14:35:25 +01:00
Jan Steemann dee106d58b fixed jslint warning 2014-03-05 14:35:14 +01:00
Frank Celler 81daeb47a7 add missing page, cleanup GNUmakefile 2014-03-05 14:26:38 +01:00
Frank Celler 3d96be0cb2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-05 14:22:47 +01:00
Frank Celler 0684d0bda4 added vista locks 
Conflicts:
	GNUmakefile
	lib/BasicsC/locks-win32.c
	lib/BasicsC/locks-win32.h
 2014-03-05 14:22:27 +01:00
Michael Hackstein 72cb71d6b2 Fixed link to cluster GUI 2014-03-05 14:13:59 +01:00
Jan Steemann 75eed02014 updated manual 2014-03-05 13:12:46 +01:00
Jan Steemann 7664d75e6d prevent usage of _useDatabase() in web interface 2014-03-05 13:04:32 +01:00
Jan Steemann 48b44602ed Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 12:14:46 +01:00
scottashton 8f79530954 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 11:21:21 +01:00
scottashton 11b11412b6 fixed bug jan discovered 2014-03-05 11:20:55 +01:00
Jan Steemann 164394bb9a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 10:47:02 +01:00