1
0
Fork 0
Commit Graph

4255 Commits

Author SHA1 Message Date
Michael Hackstein 61dac9b2ce Fixed scss-lint warnings 2014-03-19 16:38:21 +01:00
scottashton cf5c1538b6 scss-css, removes shellView.css 2014-03-19 16:32:47 +01:00
scottashton 84737c30db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 16:13:14 +01:00
scottashton 815112bc7a scss css refactoring 2014-03-19 16:12:58 +01:00
Michael Hackstein b544c69f93 Fixed scss-lint warnings 2014-03-19 16:10:42 +01:00
Michael Hackstein bd6677c42b 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/generated.css
2014-03-19 15:31:20 +01:00
Michael Hackstein bcceb5cb5a Fixed pagination, buttons, a table in documents view and scss-lint warning 2014-03-19 15:30:35 +01:00
scottashton 85645e3cf3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 14:54:25 +01:00
scottashton cd49e6defa css scss refactoring 2014-03-19 14:54:04 +01:00
gschwab 4faa60c65d fixed scsslint bug 2014-03-19 13:51:22 +01:00
gschwab 878365778e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 13:49:25 +01:00
gschwab fe16832e01 css refactoring: started layout.css 2014-03-19 13:49:16 +01:00
scottashton d5f3352411 css refactoring 2014-03-19 13:39:22 +01:00
scottashton 3fb3b82e79 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 10:30:22 +01:00
scottashton df8d2dbd89 removed 2 unused css files and fixed minor dashboard bug 2014-03-19 10:30:14 +01:00
gschwab 23905b1d7a css refactoring: fixed scsslint 2014-03-19 10:00:21 +01:00
gschwab 21633d77cc css refactoring: footerView.css 2014-03-19 09:58:45 +01:00
Michael Hackstein 3ca5dd163c Added generated css 2014-03-19 09:19:02 +01:00
Michael Hackstein 0ade3e15f7 Fixed the save document info text, was off by 5px 2014-03-19 09:16:53 +01:00
Michael Hackstein fb02eb07f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
2014-03-18 18:32:27 +01:00
Michael Hackstein 1eb45e7e9a Almost finished with documentsView.css however still some stuff to cleanup left. System is at least in a stable state. Layout of buttons in headerbar has slightly changed (they were off by 1px) 2014-03-18 18:26:14 +01:00
gschwab 444518dc3b deleted unused css 2014-03-18 17:04:37 +01:00
gschwab edb7d4ab13 deleted unused css-file 2014-03-18 16:46:10 +01:00
gschwab ca1d1c7eb5 deleted dead code 2014-03-18 16:12:31 +01:00
Michael Hackstein b8ce2a5b70 Fixed layout bug in graph layout 2014-03-18 16:05:02 +01:00
gschwab e1b531215a fixed some scsslint-problems 2014-03-18 15:28:05 +01:00
gschwab 4ae7297eaa merged 2014-03-18 15:25:45 +01:00
gschwab 8af66ca112 css refactoring: queryView.css => _queryView.scscc, pt 2 2014-03-18 15:18:26 +01:00
gschwab 98bc899807 css refactoring: queryView.css => _queryView.scscc 2014-03-18 15:17:20 +01:00
scottashton 6c6f27d4f6 removed unused images 2014-03-18 14:51:42 +01:00
Michael Hackstein be1e290a10 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-18 13:45:32 +01:00
Michael Hackstein e4f14f0130 Contiuned porting documentView.css. Almost done, there is one too general rule left 2014-03-18 13:45:29 +01:00
scottashton 5117447ef7 fixed bug in systemUserTimeChart 2014-03-18 13:38:21 +01:00
Michael Hackstein 8bef15ce62 Started translating docmentView.css created tabViews and jsonEditor.scss on the way 2014-03-18 12:57:53 +01:00
Michael Hackstein ff144f5395 REmoved now empty collectionView.css 2014-03-18 08:29:57 +01:00
Michael Hackstein 888c299257 Moved collectionView.css to scss 2014-03-18 08:29:19 +01:00
Michael Hackstein c3516c60c4 Fixed karma tests and jslint whining 2014-03-17 16:58:53 +01:00
Michael Hackstein 20f7a05cf7 Removed the now empty collectionsItemView.css 2014-03-17 16:30:51 +01:00
Michael Hackstein 58a9b5dc85 Moved collectionsItemView.css to scss reduction 100% so basicly removed 2014-03-17 16:30:17 +01:00
Michael Hackstein 296278cfbc Removed the empty collectionsView.css 2014-03-17 16:09:47 +01:00
Michael Hackstein 64f3e3b332 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-17 16:08:24 +01:00
Michael Hackstein 578097a345 Moved collections.css to scss, reduction: 50% 2014-03-17 16:08:17 +01:00
gschwab 300b3a8748 css refactoring 2014-03-17 15:47:29 +01:00
gschwab 0a7396b93c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-17 15:15:49 +01:00
gschwab ec6ab8811e removed dead code 2014-03-17 15:15:24 +01:00
scottashton 24b9e9492f DASHBOARD CLEANUP 2014-03-17 15:04:09 +01:00
scottashton 12e70386f2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-17 12:00:15 +01:00
scottashton ac1b6e1024 bugfixes in dahsboard 2014-03-17 12:00:10 +01:00
Michael Hackstein f230fe0328 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-17 11:58:30 +01:00
Michael Hackstein 98d01f3bcb Fixed bug in width of cluster overview modal dialogs 2014-03-17 11:58:25 +01:00
gschwab fe5d2096fa css refactoring: deleted general.css; already backuped by scss 2014-03-17 10:27:23 +01:00
gschwab 9810780ebe css refactoring: moved content of loginView.css to _login.scss: not used yet, so not active in style.scss 2014-03-17 09:21:34 +01:00
Michael Hackstein fe1762beda Fixed a bug in the configuration for the graph viewer 2014-03-17 08:32:00 +01:00
Michael Hackstein f33b3cf76a Fixed a syntax error in css 2014-03-16 22:42:00 +01:00
Jan Steemann 97d428341b issue #781: Cant save current query from AQL editor ui 2014-03-14 17:56:18 +01:00
gschwab 48734cc0f3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-14 16:49:06 +01:00
gschwab 945954706a removed legacy check 2014-03-14 16:49:01 +01:00
Jan Steemann 1b69e337a6 fixed datafiles issues 2014-03-14 13:25:15 +01:00
gschwab 04b29a5511 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-14 11:22:27 +01:00
gschwab 1ee66b3e50 added id to tiles 2014-03-14 11:21:47 +01:00
Michael Hackstein 646abf52d8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-14 10:54:59 +01:00
Michael Hackstein f7a85aa079 Fixed Cluster Agency Communication Tests 2014-03-14 10:54:26 +01:00
Jan Steemann d10258594e issue #772: added diagnostic output for Foxx application upload
Conflicts:
	CHANGELOG
2014-03-14 10:50:38 +01:00
Max Neunhoeffer d2ddbc18b8 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-14 10:38:04 +01:00
Max Neunhoeffer 2a0e487520 Improve error reporting. 2014-03-14 10:33:22 +01:00
gschwab 03eba9d7fe added reset for create dialog 2014-03-14 10:32:38 +01:00
gschwab c4ea53e70e fixed index problem 2014-03-14 09:37:30 +01:00
gschwab fe596f98d6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-14 08:50:09 +01:00
gschwab 2032a0dab4 fixed index problem 2014-03-14 08:49:10 +01:00
Jan Steemann f4752e8f91 added tests for error codes and messges 2014-03-13 23:56:45 +01:00
Jan Steemann e1ad20cb85 added derived file 2014-03-13 22:17:21 +01:00
Jan Steemann f7a9023c7c fix error message & number return in arangosh 2014-03-13 22:06:06 +01:00
Jan Steemann ec75cbe11a transactionally query installed apps so prevent race conditions in case of parallel de-installation of apps 2014-03-13 21:50:19 +01:00
Jan Steemann 9b0bb25cc5 don't requeue identical global context methods 2014-03-13 21:48:27 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
gschwab 9e5eee9ea0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-13 15:24:44 +01:00
gschwab 7e6f32bc6f fixed problem with button colors 2014-03-13 15:24:35 +01:00
Max Neunhoeffer 51ab7bbb9b Skip dump and import tests on the cluster because they cannot work. 2014-03-13 13:38:19 +01:00
Max Neunhoeffer d84fd0a37f Really deactivate a test that cannot work on the cluster. 2014-03-13 13:35:43 +01:00
Max Neunhoeffer 0d3b1eccb4 Do not remove logs directory after ruby tests. 2014-03-13 09:51:46 +01:00
Jan Steemann 0dfac28f71 jslint 2014-03-12 17:54:28 +01:00
Jan Steemann 0862d45f0a fixed collection type selection when creating collection via web interface
Conflicts:
	CHANGELOG
2014-03-12 17:54:11 +01:00
gschwab f20e253daf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-12 16:41:39 +01:00
gschwab d93bf89b60 added id to info-button 2014-03-12 16:41:29 +01:00
Max Neunhoeffer 9e42ec4409 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-12 16:21:38 +01:00
Max Neunhoeffer 77296e3a84 Enable SSL on cluster. 2014-03-12 16:21:19 +01:00
gschwab 7d70117186 fixed multiple ids 2014-03-12 15:14:26 +01:00
gschwab ce6f54db96 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-12 15:10:09 +01:00
gschwab 0bae26d890 fixed save action of edit collection 2014-03-12 15:09:59 +01:00
Jan Steemann babaf2738b adjusted tests 2014-03-12 14:19:13 +01:00
Jan Steemann 35cf13a38c more tests for shapes 2014-03-12 13:26:09 +01:00
Heiko Kernbach 51d7f07a38 corrected design error 2014-03-11 18:40:54 +01:00
Heiko Kernbach 09ac30a9e7 corrected design error 2014-03-11 18:40:15 +01:00
Heiko Kernbach 6bf3c91fb8 scss fixed warning 2014-03-11 18:36:58 +01:00
Heiko Kernbach 039312e39c scss fix 2014-03-11 18:15:46 +01:00
Heiko Kernbach 68cf81f9e0 delay counter for server is offline notification 2014-03-11 18:01:25 +01:00
Heiko Kernbach b6c4a87055 new shortcuts class added to aqleditor 2014-03-11 17:45:42 +01:00
Heiko Kernbach 4b3829e3a8 added shortcuts for docs editor, added scss shortcut class 2014-03-11 17:29:43 +01:00
Heiko Kernbach 89245e0ce3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 15:18:43 +01:00
Heiko Kernbach 89f1ea5b8a removed licence+readme 2014-03-11 15:18:35 +01:00
Heiko Kernbach 1cb89427c5 added phantomcss 2014-03-11 15:18:16 +01:00
gschwab 306f9674de fixed some more tests, should be all green now 2014-03-11 14:57:02 +01:00
Michael Hackstein 7247ed9acb Removed unused views from tests 2014-03-11 13:46:22 +01:00
Michael Hackstein 4bd3437216 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-11 13:43:07 +01:00
Michael Hackstein 419db23614 Fixed further JSTests 2014-03-11 13:42:28 +01:00
gschwab 87f6f1fb12 fixed tests in dbSelectionViewSpec.js 2014-03-11 13:32:21 +01:00
gschwab 91f3e3ed35 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 13:18:18 +01:00
gschwab 8bfd88fd7e fixed tests 2014-03-11 13:18:08 +01:00
Heiko Kernbach 57b338fd54 fixed clusterCollection/Shards jasmine specs 2014-03-11 13:07:33 +01:00
Heiko Kernbach 1f40a190e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 11:44:32 +01:00
Heiko Kernbach 186183da87 clusterDatabase/Servers - Specs fixed 2014-03-11 11:44:17 +01:00
gschwab 2db8c09b12 fixed one test 2014-03-11 11:39:12 +01:00
gschwab 0f7777c3bf fixed navigationViewSpec.js tests 2014-03-11 11:15:56 +01:00
gschwab e881504e40 stopping scsslint tests 2014-03-11 10:58:09 +01:00
gschwab 21bb394ce3 yet another scsslint test 2014-03-11 10:55:13 +01:00
gschwab 26bab63e80 yet another scsslint test 2014-03-11 10:50:29 +01:00
gschwab caac6c6cf1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 10:37:25 +01:00
gschwab 4981739be7 another scsslint test 2014-03-11 10:37:17 +01:00
Michael Hackstein 0469b08d7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-11 10:35:30 +01:00
Michael Hackstein 1b3b286a7e Fixed further tests in the graph viewer 2014-03-11 10:35:22 +01:00
Michael Hackstein 8739215b76 Fixed GraphViewer check for btn-primary to require button-primary instead, the new class 2014-03-11 10:22:10 +01:00
gschwab 0569fbe477 scsslint test 2014-03-11 10:12:08 +01:00
gschwab 8c697dabb9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 10:11:13 +01:00
gschwab 637e1bbc66 fixed some tests 2014-03-11 10:11:06 +01:00
Max Neunhoeffer a70c082a0d Quote a string correctly for Windows. 2014-03-11 09:32:57 +01:00
Frank Celler 1d9c133bf9 fixed warning 2014-03-10 19:24:06 +01:00
gschwab 68109fa2b9 some small scss refactorings 2014-03-10 14:41:56 +01:00
gschwab 7cf458a77d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 13:10:16 +01:00
gschwab 96aa5f0b26 fixed icon-size of query/result view 2014-03-10 13:10:08 +01:00
Jan Steemann a11811dfdd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 10:30:08 +01:00
Jan Steemann 1dc2f55666 added missing API documentation for HTTP GET `/_admin/server/role` 2014-03-10 10:29:51 +01:00
Max Neunhoeffer 48a7ee708e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-10 10:21:44 +01:00
Max Neunhoeffer 24e7293dba Split shell-any tests to save time on the cluster. 2014-03-10 10:21:28 +01:00
Jan Steemann cb0e6fa4d2 fixed return value of `make jslint` 2014-03-10 09:37:23 +01:00
gschwab b4f2c2b92d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 09:26:33 +01:00
gschwab 605dc9c5bf added tooltip for gravatar 2014-03-10 09:26:26 +01:00
Jan Steemann 117af36b25 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 09:03:34 +01:00
gschwab a61c7bb713 deleted duplicate of bootstrap.js 2014-03-10 08:43:24 +01:00
Michael Hackstein ad8e6cf172 SCSS-Lint fix 2014-03-09 09:06:23 +01:00
Michael Hackstein 55b1713dbf Fixed JSLint warnings 2014-03-09 08:32:34 +01:00
Michael Hackstein 34bafb61ec Removed unused files from karma configuration 2014-03-08 22:28:54 +01:00
Jan Steemann a48a61de0c added empty files to distribution to avoid loading of old files 2014-03-07 18:16:17 +01:00
Jan Steemann 4af498d0a9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 17:24:29 +01:00
Jan Steemann 46ec0024dc fixed invalid variable name 2014-03-07 17:24:16 +01:00
gschwab ecf1a0b492 fixed tile layout 2014-03-07 17:18:06 +01:00
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
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
gschwab f18095af7a reverted to older version... 2014-03-07 14:36:33 +01:00
Michael Hackstein c97076bf18 SCSS-Lintomator 2014-03-07 13:52:24 +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
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
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
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
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
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
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
gschwab 43b0e8c692 css refactoring: deleted .thumbnails2 and appearences 2014-03-06 14:19:56 +01:00
gschwab 1978b38368 div-tag removed: duplicate 2014-03-06 10:49:01 +01:00
scottashton 034f244d8f added constants for chart types 2014-03-06 10:38:56 +01:00
scottashton 7651740d87 fixed bug, detail chart title not showing after reload 2014-03-06 09:22:17 +01:00
scottashton 1ea001e538 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 08:37:18 +01:00
gschwab b8b55f21c0 missing closing div-tag inserted 2014-03-05 17:06:50 +01: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
gschwab 986d79c54a fixed pagination - small refactoring 2014-03-05 16:28:21 +01:00