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

4938 Commits

Author SHA1 Message Date
Claudius Weinberger 109c6d6304 redesign dashboard 2014-05-11 23:45:36 +02:00
Claudius Weinberger 86cd2a8390 redesign dashboard 2014-05-11 23:43:09 +02:00
Claudius Weinberger 1e32c7a2d2 redesign dashboard 2014-05-11 23:22:41 +02:00
Claudius Weinberger 3740035736 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-05-11 22:43:48 +02:00
Claudius Weinberger 14256b504e redesign dashboard 2014-05-11 22:42:49 +02:00
Frank Celler a315c7cc16 better history 2014-05-11 22:39:42 +02:00
Claudius Weinberger cb28bb478a design Dashboard 2014-05-11 20:58:28 +02:00
Claudius Weinberger 22344c9b66 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 15:12:52 +02:00
Claudius Weinberger 71c50b9942 redesign dashbaord 2014-05-11 15:12:27 +02:00
Frank Celler d376c70b20 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-05-11 15:04:42 +02:00
Frank Celler 7044757739 fixed order (big number on top) 2014-05-11 15:03:31 +02:00
Claudius Weinberger 1b1241f91e Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 00:41:54 +02:00
Claudius Weinberger ea487051c4 redesign dashboard 2014-05-11 00:41:36 +02:00
Frank Celler d1172f7f48 added cutoff 2014-05-11 00:16:42 +02:00
Claudius Weinberger 9252bb8629 redesign dashboard 2014-05-10 22:31:17 +02:00
Claudius Weinberger 67672b8492 redesign Dashboard 2014-05-10 21:35:19 +02:00
Jan Steemann 442fa7503c added more delay for busy workers 2014-05-10 02:34:18 +02:00
Jan Steemann d23fe23254 added tasks manual entry 2014-05-10 02:25:59 +02:00
Jan Steemann bb25e5cb72 added derived file 2014-05-10 00:46:47 +02:00
Jan Steemann 548a79ac4d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-10 00:43:40 +02:00
Jan Steemann cfc2d407d7 added tests for task management 2014-05-10 00:43:14 +02:00
Max Neunhoeffer 8ce1b08183 Add a ClusterMethod to truncate a collection in a cluster. 2014-05-09 23:14:41 +02:00
Jan Steemann 5bca4e354b fix preselection of query select box after adding 2014-05-09 21:47:51 +02:00
Claudius Weinberger 7844755d8e redesign Dashboard 2014-05-09 21:37:19 +02:00
Heiko Kernbach 39a620e6d5 scss lint 2014-05-09 20:33:38 +02:00
Heiko Kernbach fac8fccef2 scss lint 2014-05-09 20:23:16 +02:00
Heiko Kernbach 22a9043f32 query view 2014-05-09 20:02:36 +02:00
Max Kerp aa2971c349 Issue #513 : fixed JSLint 2014-05-09 19:55:59 +02:00
Max Kerp eab7955c4a Issue #513 Almost there. Just cleaning up now. 2014-05-09 19:35:37 +02:00
Max Kerp 0623f6f4cd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 19:02:55 +02:00
Max Kerp de5bd18056 implemented override of custom queries functionality 2014-05-09 19:02:48 +02:00
Heiko Kernbach 91ee14605c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-09 18:49:33 +02:00
Heiko Kernbach f3665a1943 query view, table css fix, added delete button for custom query 2014-05-09 18:46:41 +02:00
Jan Steemann 3becebf488 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 17:36:42 +02:00
Jan Steemann 82595ee169 improved periodic task management 2014-05-09 17:36:24 +02:00
Frank Celler dbbde35340 Merge branch'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:30:59 +02:00
Max Kerp 02842fb19e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:24:16 +02:00
Max Kerp 16600971b2 Working on the custom query manager 2014-05-09 17:23:57 +02:00
Frank Celler 65ad94d9cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:15:11 +02:00
Frank Celler c2d57c7909 added applicationContext and foxxFilename 2014-05-09 17:12:55 +02:00
Frank Celler 327d669741 fixed safeJoin (missing join) 2014-05-09 17:10:30 +02:00
scottashton dfbe827525 more tests 2014-05-09 16:23:17 +02:00
Jan Steemann eb73bfb127 make some collections smaller 2014-05-09 15:22:11 +02:00
scottashton 7433d6bf35 disabled useSSLonCoordinators, currently not supported 2014-05-09 14:15:44 +02:00
Jan Steemann 92f3f277f1 make some of the system collections smaller 2014-05-09 13:50:08 +02:00
Jan Steemann 91327e1497 fixed jslint warning 2014-05-09 13:31:52 +02:00
Max Neunhoeffer fb7f28f488 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-09 11:48:21 +02:00
Max Neunhoeffer 21b0264e01 Sort out SSL in PortFinder. 2014-05-09 11:48:06 +02:00
scottashton 4c376a991d finished tests showClusterView and gained 100% coverage, fixe modal bug in showClusterView 2014-05-09 09:01:32 +02:00
Jan Steemann 20f1940458 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 00:42:32 +02:00
Jan Steemann c843a12149 jshund 2014-05-09 00:42:18 +02:00
Michael Hackstein a9bd2b3259 Fixed include order of backbone models and collections 2014-05-08 23:22:15 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Michael Hackstein b7ac696af8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-08 22:41:10 +02:00
Michael Hackstein 92f02fbce3 Fixed design bugs in graph viewer 2014-05-08 19:09:17 +02:00
Jan Steemann 78185a60d7 fixed return code for async job cancellation 2014-05-08 18:27:46 +02:00
scottashton 6a6e92eb5c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-08 15:16:51 +02:00
scottashton 31355e7aca showClusterView tests 2014-05-08 15:16:45 +02:00
Jan Steemann f18d117228 added GC 2014-05-08 14:36:12 +02:00
scottashton a97054c20a removed deleted files from karma config file 2014-05-08 14:17:15 +02:00
scottashton 9cd765e4df Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-08 14:15:36 +02:00
scottashton 3ebfbc099b more tests for showClusterView, fixed bug so documents table is drawn after deletion again 2014-05-08 14:15:31 +02:00
Jan Steemann 0218291d20 added test for issue #848 2014-05-08 14:08:24 +02:00
Frank Celler 755558d734 removed old files 2014-05-08 11:45:53 +02:00
Frank Celler 0ecfe5e154 added empty remark 2014-05-08 11:18:08 +02:00
Michael Hackstein f4b1002856 Fixed tests for resizing 2014-05-07 22:30:53 +02:00
Michael Hackstein f7c9b68807 Fixed resize handling for graph viewer 2014-05-07 21:48:09 +02:00
Michael Hackstein b34c90acf3 Fixed test for arangoAdapterUI 2014-05-07 21:29:56 +02:00
Michael Hackstein c1ab48f029 Fixed a bug where grouping of nodes was not executed correctly #838 2014-05-07 21:23:29 +02:00
Michael Hackstein c124e03782 Fixed a bug where random start node and direction of graph was not accepted properly 2014-05-07 21:19:15 +02:00
Michael Hackstein 81b866a5a4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-07 21:04:08 +02:00
Michael Hackstein ad374858b4 Fixed merge conflicts with shutdown button spec 2014-05-07 21:03:59 +02:00
Jan Steemann 21cfd10453 added AQL FLATTEN function 2014-05-07 19:50:58 +02:00
Jan Steemann 7f9446f6bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 18:48:44 +02:00
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
scottashton ddbeb4aecb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 17:57:59 +02:00
scottashton e1d05d178e started tests for showClusterView 2014-05-07 17:57:24 +02:00
Max Neunhoeffer 62ca0e9a30 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-07 16:47:06 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
scottashton 97a776510e more tests 2014-05-07 16:19:19 +02:00
scottashton 169ca7589e fixed healthcheck 2014-05-07 11:12:37 +02:00
Michael Hackstein 0c57095b9f Added spec for shutdown button 2014-05-06 19:27:07 +02:00
Max Kerp 3e72aa86c8 Issue #513 I created a third tab for managing custom queries 
the new editor will be changed to a table just like in the
collectionsView tommorow.
 2014-05-06 17:41:46 +02:00
scottashton 0b3bfdf3e6 tests for cluster views 2014-05-06 17:09:16 +02:00
Heiko Kernbach 2d4204692b jslint 2014-05-06 15:08:55 +02:00
scottashton 0dd1ec64f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-06 14:54:05 +02:00
scottashton 37ff09579c adjusted healthcheck 2014-05-06 14:53:58 +02:00
Heiko Kernbach 870c032917 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-06 14:45:50 +02:00
Heiko Kernbach e5139f3e84 100% coverage of navigationView 2014-05-06 14:45:43 +02:00
scottashton 4f4c5388d5 enabled cluster frontend to configure a cluster for ssl comm 2014-05-06 14:22:11 +02:00
Jan Steemann 2320c20f61 issue #847: fixed wrong return code value in docs 2014-05-06 13:11:12 +02:00
Max Neunhoeffer ad5db2a380 Use cluster auth for shutdown. 2014-05-06 13:02:38 +02:00
Max Neunhoeffer 7b44869eb3 Fix kickstarter process startup and shutdown. 2014-05-06 11:44:25 +02:00
Jan Steemann 8f821d62fe prevent AQL query from failing 2014-05-05 21:50:15 +02:00
scottashton c81686ab5b delete index only by collection name 2014-05-05 15:27:31 +02:00
scottashton 123ac848a8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-05 15:17:49 +02:00
scottashton cd9f6da1f7 refactored arangoCollectionsCollection 2014-05-05 15:17:38 +02:00
Michael Hackstein 8fe265d434 Fixed SCSS-Lint 2014-05-05 10:52:14 +02:00
Claudius Weinberger 50cb3f5600 Dashboard redesign 2014-05-05 08:26:36 +02:00
Frank Celler 31a5c8f7fc fixed percision 2014-05-05 00:06:57 +02:00
Claudius Weinberger 6688cb4190 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
 2014-05-04 23:41:28 +02:00
Claudius Weinberger bfeff84705 Dashboard redesign 2014-05-04 23:37:31 +02:00
Frank Celler acc173b7d7 fixed title 2014-05-04 21:44:09 +02:00
Frank Celler 29fb388b1c repair async & sync 2014-05-04 20:30:37 +02:00
Claudius Weinberger f36dcb8164 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Dashboard redesign
 2014-05-04 18:50:30 +02:00
Claudius Weinberger 87c54c6163 Dashboard redesign 2014-05-04 18:49:01 +02:00
Frank Celler db4b974814 cluster statistics 2014-05-04 15:28:18 +02:00
Frank Celler 3608301be2 cosmetics 2014-05-04 15:27:34 +02:00
Claudius Weinberger ce4cd13669 Dashboard redesign 2014-05-04 14:10:44 +02:00
Claudius Weinberger 169d0d1262 Dashbaord redesign 2014-05-04 00:36:59 +02:00
Claudius Weinberger 73f512e548 Dashboard redesign 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
	js/apps/system/aardvark/frontend/scss/_constants.scss
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-04 00:33:21 +02:00
Claudius Weinberger da6d3a2e7d shboard redesign 2014-05-04 00:25:02 +02:00
Frank Celler e34e331f1c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-04 00:07:25 +02:00
Frank Celler 723cf4da2a fixed statistics for standalone 2014-05-04 00:06:45 +02:00
Michael Hackstein 9596b7d9c0 Resized the legend of graphs based on screen-width 2014-05-03 21:05:46 +02:00
Jan Steemann 9fef86a071 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 22:11:32 +02:00
Jan Steemann b978a271ea added AQL function `CURRENT_DATABASE()` 2014-05-02 22:06:47 +02:00
Jan Steemann 0a5e641f97 added index memory usage statistics 
this also adds index memory usage to the output of the `figures` method
 2014-05-02 22:05:29 +02:00
Heiko Kernbach 3434db8de1 #821 - added icon indicator for server status (footer) 2014-05-02 19:32:25 +02:00
Heiko Kernbach 512d1681e3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 19:28:40 +02:00
Heiko Kernbach f197fbc3d1 fixed specs 2014-05-02 19:28:32 +02:00
Max Kerp 64aa7b8eec fixed that a click anywhere on the foxxAppView opens a new Tab 
Now only a click on the image will open the app in a new Tab
 2014-05-02 19:14:33 +02:00
Heiko Kernbach 3f7fe4c533 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 19:09:05 +02:00
Heiko Kernbach 0259dbb011 fixed spec 2014-05-02 19:06:28 +02:00
Max Kerp 6db9934d86 changed the padding of the dropdown-header 2014-05-02 19:02:49 +02:00
Max Kerp 7e014039f9 fixed issue #735. A click on the app img opens the app in a new tab now 2014-05-02 18:59:24 +02:00
Claudius Weinberger 0bc2d9872c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 17:19:53 +02:00
Claudius Weinberger 1682a95e8a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
 2014-05-02 17:18:26 +02:00
Heiko Kernbach efb8396576 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 17:17:07 +02:00
Heiko Kernbach 43ec4eae4a added jsoneditor code theme, removed readonlykeys 2014-05-02 17:16:59 +02:00
Michael Hackstein 46ae6a19d9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 15:36:19 +02:00
Michael Hackstein 46ec20a7e1 Added edge labels #805 2014-05-02 15:36:14 +02:00
Heiko Kernbach 86a74ae445 update views after removal of a database 2014-05-02 15:14:16 +02:00
Max Kerp 874c8c769e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 14:59:34 +02:00
Heiko Kernbach 2237d1a93f bugfix database nav menue, collections not re-fetched/rendered 2014-05-02 14:52:17 +02:00
Max Kerp 65f6bf2a3f Added a divider in the databse dropdown menu and changed color of 
corneredBadge to be consistent with the overall design
 2014-05-02 14:36:10 +02:00
Heiko Kernbach e18a38edaa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 12:31:10 +02:00
Heiko Kernbach 7f11405f59 manage dbs now shows all collections + specs for changes 2014-05-02 12:31:03 +02:00
Jan Steemann 65023d63f8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 12:00:49 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Heiko Kernbach ab0f4dbe63 added hotkeys + tests for jasmin 2014-05-02 11:12:56 +02:00
Heiko Kernbach f3d2e28379 added specs for modal hotkeys 2014-05-02 10:44:14 +02:00
Heiko Kernbach 7cd6cb1039 modalview specs added 2014-05-01 22:33:23 +02:00
Heiko Kernbach 44415975bb arangoSpec 2014-05-01 22:18:32 +02:00
Heiko Kernbach f0f7f6ae2c added tests to arangoSpec 2014-05-01 22:09:13 +02:00
Heiko Kernbach a4ea3e0cf6 bugfix event loop 2014-05-01 21:25:55 +02:00
Michael Hackstein f14a05ebf5 Fixed test for change label and color 2014-04-29 11:04:40 +02:00
Michael Hackstein 8a788b3605 Fix of graphviewer change labelcolor 2014-04-29 11:04:21 +02:00
Michael Hackstein 253e893c76 Added tests for the single-machine view 2014-04-28 13:08:37 +02:00
Michael Hackstein 8e64fa2088 Added test for the cluster scenario selector 2014-04-27 21:10:12 +02:00
Michael Hackstein 1b58478e15 Removed dead code 2014-04-27 20:18:50 +02:00
Michael Hackstein f637d49bce Added a spec for loginModalView in cluster setup 2014-04-27 19:13:53 +02:00
Michael Hackstein d83b56f9f4 Fixed JSLint 2014-04-26 12:11:14 +02:00
Heiko Kernbach c6483da71f hotkeys 2014-04-25 18:14:37 +02:00
Heiko Kernbach a6baad7a48 enabled hotkeys for scrolling + modals 2014-04-25 18:02:25 +02:00
Heiko Kernbach 5dae71c4c7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-25 12:47:05 +02:00
Heiko Kernbach c941fd581b finished notification view spec 2014-04-25 12:46:59 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
scottashton dcf0f8fbb8 bugfix 2014-04-25 12:30:05 +02:00
scottashton 2076b61396 changed dashboardView, only 2 digits after comma, css bug in resizing d3charts 2014-04-25 11:42:19 +02:00
scottashton 708e0a40ae Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-25 10:30:51 +02:00
scottashton 9156d8b261 bugfix 2014-04-25 10:30:46 +02:00
Michael Hackstein ea859faeb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-25 10:20:24 +02:00
Michael Hackstein 1bb40173e6 Added more tests 2014-04-25 10:20:21 +02:00
scottashton 1be1c6afff dashbardView 100% tested 2014-04-25 09:57:58 +02:00
scottashton 8aed40c821 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-25 09:43:34 +02:00
scottashton e05c026c4d more tests 2014-04-25 09:43:27 +02:00
Heiko Kernbach 192812b06b notification completely tested 2014-04-25 09:31:42 +02:00
Michael Hackstein efff70f6a7 Added more tests for GraphViewer (contextMenu and nodeShaper) 2014-04-25 09:06:35 +02:00
scottashton 47433edfb1 lots of tests , started dashboardView test 2014-04-24 17:25:40 +02:00
scottashton cac63cb9e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-24 11:44:00 +02:00
scottashton 7dcc814e31 tests 2014-04-24 11:43:55 +02:00
Michael Hackstein 94d388ddb1 Added more tests for the ModalView. It now reached 100% coverage 2014-04-24 11:35:57 +02:00
Michael Hackstein 258f5afd99 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-24 00:44:40 +02:00
Michael Hackstein d82338adc1 Added tests for correct behaviour of callback functions in arangoCollection Model 2014-04-24 00:44:05 +02:00
Michael Hackstein 7a54d907d9 Removed debug files from karma config, they should not be tested 2014-04-24 00:43:38 +02:00
Michael Hackstein f9527934da Removed dead code 2014-04-24 00:43:06 +02:00
Michael Hackstein e3ffe8fe8a Improved users collection and added tests 2014-04-24 00:42:55 +02:00
Michael Hackstein c0a347cdc5 Added test for log model 2014-04-24 00:42:22 +02:00
Michael Hackstein 53d1b57ed7 Increased Test coverage for graph model 2014-04-24 00:40:38 +02:00
Jan Steemann 0cb2217518 no need to run the GC after each and every request during testing 
this change will hopefully make tests run a bit faster
 2014-04-23 23:22:49 +02:00
Jan Steemann 8356a13310 silence the routing cache a bit 2014-04-23 23:01:08 +02:00
Jan Steemann a4ee394d4b fixed AQL return codes in the face of cancellation 2014-04-23 19:07:34 +02:00
Michael Hackstein f988994ef5 Fixed karma tests and JSLint 2014-04-23 17:16:38 +02:00
scottashton 4bbf9970a9 minor bugfixes and resizing of detailcharts 2014-04-23 16:46:44 +02:00
Michael Hackstein 093a86f4c1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-04-23 16:05:51 +02:00
Michael Hackstein 1edd9f8699 Made all bars clickable with the unbelievable magic hack 2014-04-23 16:00:26 +02:00
scottashton 2e7649dcbc fixed modal warning bug 2014-04-23 15:58:12 +02:00
Michael Hackstein 3055fef939 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-23 15:46:12 +02:00
Michael Hackstein 50acbb1533 Made the residentSize bar clickable by using d3.js magic hack 2014-04-23 15:46:07 +02:00
scottashton 160e7501cd changed modal warning in case statistics are not yet available 2014-04-23 15:39:58 +02:00
scottashton c6dbef26d0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-23 15:26:38 +02:00
scottashton 7a744251fa fixed minor bug 2014-04-23 15:26:31 +02:00
Jan Steemann 48d3a1e35e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-23 15:09:08 +02:00
Jan Steemann af76ccfe3c issue #839: Foxx Manager missing "unfetch" 
Conflicts:
	CHANGELOG
 2014-04-23 15:09:03 +02:00
scottashton 1e32a19b6f jslinted router spec 2014-04-23 15:08:53 +02:00
scottashton 9d4d7bef6b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-23 15:07:30 +02:00
scottashton 76dd01dcfa refactored router and added modal warning whenever dahsboard statistics are not available 2014-04-23 15:07:21 +02:00
Heiko Kernbach 9c6c2de7c7 updated notification vierw spec 2014-04-23 12:35:11 +02:00
Heiko Kernbach eb5de72025 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-23 12:27:10 +02:00
Heiko Kernbach dd3456f95f added spec for notification view 2014-04-23 12:27:03 +02:00
Michael Hackstein 6458932207 Fixed issue with large collections and fixed test for arango.js 2014-04-23 09:59:06 +02:00
Michael Hackstein 7b07664c55 Removed unused code 2014-04-23 09:34:59 +02:00
scottashton ce51bff2ed jslinted dashboardview 2014-04-22 14:18:50 +02:00
scottashton 782c0ea025 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-22 14:15:29 +02:00
scottashton 7b5e25bc32 fixed detail modal view from cluster server 2014-04-22 14:15:22 +02:00
Jan Steemann 3744e8dde9 issue #796: Searching with newline chars broken? 2014-04-22 13:38:06 +02:00
Jan Steemann ce36c94082 added test for issue #796 2014-04-22 13:04:30 +02:00
Jan Steemann 4075f08aef silence foxx manager 2014-04-22 12:13:53 +02:00
Jan Steemann 75802ccf73 added derived file 2014-04-22 11:32:19 +02:00
Jan Steemann 76c09f43b5 added tests 2014-04-22 11:31:35 +02:00
Jan Steemann ec26253f77 fix handling of properties with value `false` 2014-04-22 11:31:23 +02:00
scottashton a5475ba430 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-22 11:02:10 +02:00
scottashton b7ce24aaf5 remove traces of logCollection 2014-04-22 11:02:05 +02:00
Jan Steemann c68506e02d removed deleted file 2014-04-22 10:57:51 +02:00
Jan Steemann 01a5818983 removed unused logsView.js 2014-04-22 10:56:38 +02:00
Jan Steemann 9bef8615fc removed useless file 2014-04-22 10:53:35 +02:00
scottashton 0e96bcde17 SCSS HELL 2014-04-17 17:27:05 +02:00
gschwab 0200a10e4d too many , 2014-04-17 15:03:21 +02:00
gschwab ed2a5fbb6b fixed scsslint 2014-04-17 14:57:34 +02:00
gschwab 80234f43c3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-17 14:50:23 +02:00
gschwab 6dfd793cc1 started refactored collection collectionsView 2014-04-17 14:50:17 +02:00
scottashton 931f10a402 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-17 14:12:24 +02:00
scottashton e4d5dfd7f2 clusterdashboard refactoring, backbone events are now passed into modalview 2014-04-17 14:12:13 +02:00
gschwab ca984e1212 added 'passwordToken' to create user, fixed small bug with changePassword attribute 2014-04-17 13:27:02 +02:00
scottashton ca80048166 adjusted statistics request for clusterFrontend 2014-04-17 10:17:04 +02:00
scottashton 4e4ecb40f4 adjusted statistics request for clusterFrontend 2014-04-17 09:53:10 +02:00
scottashton 7d130e56f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-17 09:50:54 +02:00
scottashton a3e10fbcae adjusted statistics request for clusterFrontend 2014-04-17 09:50:42 +02:00
Frank Celler 76b4c71d2e added isSystem to default representation 2014-04-17 09:46:10 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
 2014-04-16 20:16:22 +02:00
Frank Celler 39fd596abc changed return of users.remove 
Conflicts:
	js/actions/api-user.js
 2014-04-16 19:56:04 +02:00
scottashton 58e0d20559 fixed tests 2014-04-16 17:21:33 +02:00
scottashton eb1d0f5d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-16 17:03:32 +02:00
scottashton f1bf4e427b scss-linted files and started clusterserver dashboard ng 2014-04-16 17:03:24 +02:00
gschwab d797ee12c0 fixed scss lint 2014-04-16 16:10:40 +02:00
gschwab 9cf0de91b7 deleted unused file 2014-04-16 15:51:24 +02:00
gschwab 860c51c390 removed dead code - collectionView not used anymore, because of new modal concept - tests adjusted - part 2 2014-04-16 15:50:11 +02:00
gschwab b5f0fce04a removed dead code - collectionView not used anymore, because of new modal concept - tests adjusted 2014-04-16 15:47:46 +02:00
gschwab e9337524aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-16 15:45:23 +02:00
gschwab 1caae7c6e3 removed dead code - collectionView not used anymore, because of new modal concept 2014-04-16 15:45:17 +02:00
scottashton d0b06f66e4 dashboard d3 2014-04-16 13:37:01 +02:00
Michael Hackstein b12b6a1232 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-16 08:58:38 +02:00
Michael Hackstein e619028d08 Fixed a caching problem in IE JS Shell 2014-04-16 08:58:31 +02:00
scottashton e515acf6a2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-15 17:34:25 +02:00
scottashton 1da96a0826 dahsboard refactoring 2014-04-15 17:34:14 +02:00
Michael Hackstein 4744992648 Unified pagination of newLogs with _paginationView 2014-04-15 09:48:52 +02:00
Michael Hackstein dc164ec6d2 Fixed scss-lint warnings 2014-04-15 08:53:34 +02:00
Michael Hackstein f870abed3b Added new list of files for karma 2014-04-15 08:49:51 +02:00