1
0
Fork 0
Commit Graph

3904 Commits

Author SHA1 Message Date
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
gschwab e827859715 fixed pagination - small refactoring 2014-03-05 15:47:24 +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 dee106d58b fixed jslint warning 2014-03-05 14:35:14 +01:00
Jan Steemann 7664d75e6d prevent usage of _useDatabase() in web interface 2014-03-05 13:04:32 +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
Michael Hackstein d7de23a6c9 Fixed JSLint whining 2014-03-05 10:27:14 +01:00
gschwab e2b523f552 added header 2014-03-05 09:45:00 +01:00
gschwab 518109fe6d fixed navibar highlighting 2014-03-05 09:20:18 +01:00
Jan Steemann 3d647fcccf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 18:46:04 +01:00
Jan Steemann e45f4ba20e fix coffee script parse error error 2014-03-04 18:45:40 +01:00
scottashton 0db5f08f52 added detail view to showClusterView and fixed modal bug 2014-03-04 17:15:08 +01:00
Jan Steemann e1a190a51d fixed segfault during test on Windows 2014-03-04 16:58:22 +01:00
Max Neunhoeffer eea13770e4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 16:21:51 +01:00
Max Neunhoeffer ef474bde11 Quote string in server tests for Windows backslashes. 2014-03-04 16:21:30 +01:00
Michael Hackstein 3d5456820f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 15:37:51 +01:00
Michael Hackstein 169b3f3138 Last second style fixes 2014-03-04 15:37:47 +01:00
gschwab 7d7fadd329 fixed broken link 2014-03-04 15:28:20 +01:00
gschwab 98e79e273b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 13:53:18 +01:00
gschwab b31004300e deleted inline css 2014-03-04 13:53:13 +01:00
scottashton 0bfca1649c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 13:33:12 +01:00
scottashton 6fb391eb3f jslint hints fixed 2014-03-04 13:32:39 +01:00
Michael Hackstein 861afb4e5e Fixed merge conflicts 2014-03-04 13:31:41 +01:00
Michael Hackstein 22858b1ac1 It is now also possible to add non sharded collections (which means adding a sharded one with only one key 2014-03-04 13:25:19 +01:00
Michael Hackstein 4d9c8ff9d9 Implemented creation of sharded collections 2014-03-04 13:22:47 +01:00
Michael Hackstein 181c7b72ff Added select2 library and selct box 2014-03-04 13:22:11 +01:00
gschwab 7a27b61583 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 12:28:48 +01:00
gschwab 4358ed553f deleted inline css 2014-03-04 12:28:43 +01:00
scottashton 44ab5d1398 new method admin/history to fetch the statistics history for single arango, coordinator and dbserv 2014-03-04 12:05:00 +01:00
gschwab 66e8d281fb deleted some unused css, preparing for migration to scss 2014-03-04 11:57:34 +01:00
gschwab 4522443ef8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 11:35:30 +01:00
gschwab 17e34003d5 fixed tooltips 2014-03-04 11:35:25 +01:00
Jan Steemann 373c44e78b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 10:40:25 +01:00
Jan Steemann 92c9760cf3 added documentation 2014-03-04 10:40:17 +01:00
Frank Celler 1237ce544d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 10:35:32 +01:00
Frank Celler 5c816ec808 added clusterId in statistics 2014-03-04 10:30:17 +01:00
gschwab dde0e3dbad fixed tooltips 2014-03-04 10:15:15 +01:00
gschwab 4a6d2fc0cc changed css from class 'btn*' to corresponding class 'button*' 2014-03-04 09:45:26 +01:00
gschwab fcf5536053 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 09:38:10 +01:00
gschwab 2bacbb8d8b changed css-class from 'btn btn-close' to 'button-close' and added toggle for class 'activated' for toggle-buttons 2014-03-04 09:38:04 +01:00
Michael Hackstein 3fe7b5d75d Fixed style of GUI button and made Coordinator Icon clickable 2014-03-04 09:20:37 +01:00
Michael Hackstein 3ec843ed62 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 09:15:39 +01:00
Michael Hackstein 182fd37a43 Styled gui button for cluster overview 2014-03-04 09:15:36 +01:00
gschwab 60bf913bfc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 09:07:50 +01:00
gschwab 28deb1751a fixed wrong url from 'index.html' to 'standalone.html' 2014-03-04 09:07:45 +01:00