Michael Hackstein
db31aec469
Generated css
2014-03-07 15:16:03 +01:00
Michael Hackstein
5f52ccb377
SCSS_lint fixes finished
2014-03-07 15:13:31 +01:00
Michael Hackstein
c97076bf18
SCSS-Lintomator
2014-03-07 13:52:24 +01:00
Michael Hackstein
9f67a5f87d
SCSS-Lint
2014-03-07 11:49:12 +01:00
Michael Hackstein
68f2ac9567
Further scss-lint
2014-03-07 11:16:54 +01:00
Michael Hackstein
f6c914e481
SCSS-Lint fixes
2014-03-07 11:13:23 +01:00
Michael Hackstein
a9b0a3f479
Fixed SCSS-Lint in abstracts
2014-03-07 00:19:58 +01:00
Michael Hackstein
cb2ab14f95
Revived karma server for testing. However many, many tests are broken now...
2014-03-07 00:01:23 +01:00
Michael Hackstein
da8cbfbe22
SCSS-Lint fixes
2014-03-06 22:58:22 +01:00
Michael Hackstein
4b8dc85280
Anather renaming of server to dispatcher
2014-03-06 17:56:42 +01:00
Michael Hackstein
a59b4f7767
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-03-06 17:53:52 +01:00
Michael Hackstein
7f2ace9508
Fixed a race-condition but
2014-03-06 17:53:47 +01:00
Michael Hackstein
85b87c7595
Renamed Server to Dispatcher
2014-03-06 17:53:33 +01:00
Frank Celler
baa68e0958
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-03-06 17:38:23 +01:00
Frank Celler
15e1fbbb0d
replaced meier by arango
2014-03-06 17:38:18 +01:00
Jan Steemann
6b42df078b
sockets fix
2014-03-06 17:17:31 +01:00
Max Neunhoeffer
d206e1a1f9
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
2014-03-06 16:42:07 +01:00
Michael Hackstein
efcb50b0c8
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-03-06 16:41:22 +01:00
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