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
gschwab 1bf03dc11f fixed search bar layout 2014-03-07 17:07:34 +01:00
gschwab a3f449f62a generated new cluster.css 2014-03-07 17:01:32 +01:00
gschwab c06ea80ee9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 16:58:34 +01:00
gschwab cac2d5109e fixed most of scss 2014-03-07 16:58:27 +01:00
Max Neunhoeffer ccb037a4d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 16:48:46 +01:00
Max Neunhoeffer cd0a33de9f Seemingly fix behaviour on Windows. 
Note: WSACleanup complains and we do not know a fix.
 2014-03-07 16:48:21 +01:00
Jan Steemann 41341f3023 fixed jslint warnings 2014-03-07 16:30:04 +01:00
Max Neunhoeffer e19e72bcec Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 16:20:34 +01:00
Max Neunhoeffer 6206f91d56 Yet another fix for process shutdown on Unix. 2014-03-07 16:20:12 +01:00
gschwab afdd30a717 fixed gravatar input 2014-03-07 16:07:26 +01:00
Michael Hackstein cdf2552d93 Fixed merge conflicts and fixed scss conflicts 
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-07 15:26:10 +01:00
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
Max Neunhoeffer aca081ebaa Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 15:02:13 +01:00
Max Neunhoeffer 101486c6af Improve error handling in process startup in js testing framework. 2014-03-07 15:01:50 +01:00
gschwab 847074329f database management and graph management changed to tile view 2014-03-07 14:58:37 +01:00
gschwab 4437b0b123 reverted to older version... 2014-03-07 14:38:24 +01:00
Michael Hackstein c97076bf18 SCSS-Lintomator 2014-03-07 13:52:24 +01:00
Max Neunhoeffer 630ed5bcd9 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 12:38:37 +01:00
Max Neunhoeffer 9101d6b2bc Change documentation on user reload for coordinators. 2014-03-07 12:38:09 +01:00
Jan Steemann ec9e3f2402 debug information 2014-03-07 12:17:38 +01:00
Frank Celler ce9c992edc removed test files 2014-03-07 12:10:19 +01:00
Frank Celler 4797634b14 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-07 11:59:05 +01:00
Frank Celler 35bb498614 be less verbose 2014-03-07 11:59:01 +01:00
Michael Hackstein 9f67a5f87d SCSS-Lint 2014-03-07 11:49:12 +01:00
Jan Steemann 910996529c windows 2014-03-07 11:45:55 +01:00
Max Neunhoeffer 79ac8949dd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 11:37:31 +01:00
Max Neunhoeffer 9d43383f1d Fix automatic reload of user config on coordinators. 2014-03-07 11:37:16 +01:00
Frank Celler 9a7eb4d779 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-07 11:33:20 +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
Frank Celler e729729c4c added missing suffix 2014-03-07 11:03:45 +01:00
Jan Steemann ae202acb5c assign an id to the system database, too 2014-03-07 10:23:17 +01:00
Jan Steemann 40c842d1cb fixed redirection 2014-03-07 09:36:23 +01:00
Jan Steemann 2c1cd44558 fixed JSON formatting 2014-03-07 09:04:44 +01:00
Max Neunhoeffer aba8ca3c5d Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 08:43: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
Max Neunhoeffer 792535af65 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-06 17:55:17 +01:00
Max Neunhoeffer ed46d0d3a8 Increase TTL value for heartbeat status in agency to 8. 2014-03-06 17:54:34 +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