Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,617 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

4033 Commits

Author SHA1 Message Date
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 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
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
Michael Hackstein 72cb71d6b2 Fixed link to cluster GUI 2014-03-05 14:13:59 +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
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
Jan Steemann 8815dfe288 jslint 2014-03-04 08:38:43 +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
scottashton 2aa5ffa270 added missing files 2014-03-03 18:19:43 +01:00
scottashton 90e18f40d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 18:18:27 +01:00
gschwab 7b31ea6f43 added confirmation dialogs for editing and deleting cluster plans 2014-03-03 17:20:30 +01:00
scottashton c99b2c52ab removed no longer needed logs 2014-03-03 15:45:37 +01:00
scottashton 09e5069ec8 cleaned up merge mess 2014-03-03 15:24:10 +01:00
gschwab cedc1cf591 fixed routing problem after cancelling plannig a cluster 2014-03-03 15:19:20 +01:00
gschwab 702eeb90e8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 15:18:30 +01:00
gschwab 908e691205 fixed routing problem after cancelling plannig a cluster 2014-03-03 15:17:31 +01:00
scottashton 6c3a3717d0 fixed cluster chart 2014-03-03 15:12:11 +01:00
Michael Hackstein dc7a4c21a9 Fixed start and stop updating when clicking on DBServer Dashboards 2014-03-03 14:34:03 +01:00
Michael Hackstein 5af6f55f9c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 14:13:43 +01:00
Michael Hackstein 24f98d69db Fixed a bug where it was not posible to shutdown a cluster, change the plan and restart it without reloading 2014-03-03 14:13:40 +01:00
gschwab 17554866fd fixed problem with disappearing css class after rerender in ClusterView 2014-03-03 13:46:30 +01:00
gschwab e34579764f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:46:22 +01:00
gschwab 47917c403e modal background will be darker with waitModal 2014-03-03 12:46:18 +01:00
Jan Steemann a4451d3459 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:03:51 +01:00
Jan Steemann 32fe5cf684 updated api-docs 2014-03-03 12:03:33 +01:00
gschwab 04a7a047e0 background set to transparent and color to white for waitModal dialog 2014-03-03 12:01:46 +01:00
Michael Hackstein 9ec7a10a4c The user now gets a dialog while shutting down the cluster 2014-03-03 11:54:14 +01:00
Michael Hackstein 2f9124afb5 Fixed dbserver as modal dialog, shutdown cluster button now seems to be working better 2014-03-03 11:35:38 +01:00
Michael Hackstein 057a506a34 Fixed indention 2014-03-03 11:25:51 +01:00
Michael Hackstein d1c0ce6074 Removed 'back to cluster' button from modal dialog 2014-03-03 11:24:48 +01:00
Michael Hackstein cfef689512 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 11:04:08 +01:00
Michael Hackstein 6d3441ec87 Resizing of Application image now works again 2014-03-03 11:04:02 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 1481ceba42 documentation 2014-03-03 10:28:38 +01:00
Michael Hackstein bc8626ccd8 In a multi server setup the shardcounter is now default 0 2014-03-03 09:53:37 +01:00
Michael Hackstein fff19e4c49 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-03 09:50:01 +01:00
Michael Hackstein 472c755f43 Added Style for close button 2014-03-03 09:49:58 +01:00
Jan Steemann 09a1f3245e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-03 09:47:28 +01:00
scottashton 34cb636db9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-03 09:47:21 +01:00
scottashton 573a9eadf9 added resize functionality for modal and single chart 2014-03-03 09:47:16 +01:00
Jan Steemann a3db6e7fc8 print error if user cannot be added 2014-03-03 09:46:04 +01:00
Michael Hackstein 3d80d931f4 The webinterface will now call home, display of new version to be implemented 2014-03-03 09:36:14 +01:00
Jan Steemann cfc0ebf904 fixed jslint warnings 2014-03-03 08:51:17 +01:00
Frank Celler 33b15d7660 release version 2.0.0-rc1 2014-03-02 08:06:31 +01:00
Frank Celler a8e0e1a9e4 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-03-02 07:52:25 +01:00
Michael Hackstein 5ff83d8e49 Added database icon svg 2014-03-01 22:08:25 +01:00
Michael Hackstein 0dffe98b6b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 22:07:51 +01:00
Michael Hackstein 7940a3cf01 Fixed shutdownbutton size and moved icons for coordinators and db servers 2014-03-01 22:07:49 +01:00
Claudius Weinberger 6a02c5a75a some UI changes 2014-03-01 22:06:24 +01:00
Claudius Weinberger b712f906bc some UI changes 2014-03-01 22:04:48 +01:00
Michael Hackstein 00b504301d Updated Coordinator icon 2014-03-01 20:55:19 +01:00
Michael Hackstein e920fece2a Added a server shutdown button to the navigation bar and created a modal view fpr the dashboard. NOt used yet due to problems with statistics in modals 2014-03-01 20:35:44 +01:00
Michael Hackstein 44397b9bce Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 20:34:52 +01:00
Michael Hackstein 28d4e2c1f8 Added cancel buttons to plan selectors and reverted to simple view for dashboard with added back button and back-button in browser working 2014-03-01 20:34:45 +01:00
Michael Hackstein 7a93757a16 Added a cancel button to all plans 2014-03-01 18:43:17 +01:00
Michael Hackstein 992dbf828d Fixed a type in bootstrap 2014-03-01 18:37:16 +01:00
Michael Hackstein 374223a00f Fixed navigation in cluster overview 2014-03-01 18:36:58 +01:00
Frank Celler f62c3f3678 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 18:14:18 +01:00
Frank Celler cdf635d5c6 added residentSizePercent 2014-03-01 18:14:14 +01:00
Michael Hackstein 5b093918e6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 17:33:39 +01:00
Michael Hackstein 2a796630bd Removed unused import 2014-03-01 17:33:34 +01:00
Michael Hackstein bfa6e46b4a Updated dashboard and removed headerbar 2014-03-01 17:32:46 +01:00
Frank Celler e70c9bed21 added total memory for mac 2014-03-01 17:16:10 +01:00
Frank Celler cff606d6ab Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 16:14:43 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Michael Hackstein dcb022a915 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 15:47:27 +01:00
Claudius Weinberger c7f6315ffe Dashboard changes 2014-03-01 15:46:41 +01:00
Michael Hackstein c79215d71f If a user now clicks on a coordinator hewill be redirected to normal Admin Interface 2014-03-01 15:46:00 +01:00
Claudius Weinberger 17ee3ef0ac some UI changes 2014-03-01 14:20:12 +01:00
Michael Hackstein 799f443b2f Heartbeats are now interpreted the new way 2014-03-01 14:07:58 +01:00
Michael Hackstein 59c597061c Fixed a check in the clusterPlan, a plan is now propoerly identified as test, symmetric or asymmetric 2014-03-01 13:41:36 +01:00
Michael Hackstein 8d8b1a12fd Fix relocation of hash information on startup of cluster interface 2014-03-01 13:18:24 +01:00
Michael Hackstein b34b2b17b9 The Plan is now thrown away after deleting it and not maintained locally in the browser 2014-03-01 13:17:49 +01:00