1
0
Fork 0
Commit Graph

11376 Commits

Author SHA1 Message Date
Frank Celler adef69b625 fixed header 2014-03-04 13:55:44 +01:00
Frank Celler cce0f9f99e added cluster pic 2014-03-04 13:54:38 +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
Max Neunhoeffer 63bcda3c78 Fix a typo for Windows. 2014-03-04 13:13:10 +01:00
Max Neunhoeffer 2044fc9c40 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Conflicts:
	lib/BasicsC/process-utils.c
2014-03-04 12:32:27 +01:00
Max Neunhoeffer dcb2feccd0 Another try to fix process startup under Windows. 2014-03-04 12:31:14 +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
Max Neunhoeffer 57555223ee Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 12:13:07 +01:00
Max Neunhoeffer b21529a725 Report errors under Windows better. 2014-03-04 12:12:52 +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
Max Neunhoeffer e652d663bf Fix socket closing under Windows. 2014-03-04 11:23:11 +01:00
Max Neunhoeffer c298863dd1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 10:58:13 +01:00
Max Neunhoeffer 41eaf9aaab Under Windows, do only SO_EXCLUSIVEADDRUSE. 2014-03-04 10:57:46 +01:00
Jan Steemann c18055b284 fixed compiler warning 2014-03-04 10:41:55 +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 66af319823 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 10:15:23 +01:00
gschwab dde0e3dbad fixed tooltips 2014-03-04 10:15:15 +01:00
Frank Celler 1e972d8e4c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 09:56:26 +01:00
Frank Celler 5bd4cca336 added image 2014-03-04 09:56:16 +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
Frank Celler 480498412e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 09:02:15 +01:00
Michael Hackstein dc6882ffec Style fixes 2014-03-04 09:02:00 +01:00
Michael Hackstein 852f7d4ac2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 08:58:24 +01:00
Michael Hackstein 3783f21734 Fixed a bug when deleting the cluster plan 2014-03-04 08:58:21 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Jan Steemann 8815dfe288 jslint 2014-03-04 08:38:43 +01:00
Jan Steemann 9cdd453043 fixed compiler warning 2014-03-03 19:25:42 +01:00
Jan Steemann d82a94b020 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 19:24:35 +01:00
Jan Steemann c092158891 disable forwarding of expect header 2014-03-03 19:24:26 +01:00
gschwab 1e05c97a61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 18:21:30 +01:00
gschwab 3f1f4d7344 added class for activated buttons, added to collections view 2014-03-03 18:21:23 +01:00