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

4863 Commits

Author SHA1 Message Date
Heiko Kernbach e5115fabfd removed console logs 2014-05-16 12:19:19 +02:00
Heiko Kernbach f5c1fcd25f added shellViewSpec, invertet order of logs showing up @ frontend 2014-05-16 12:18:19 +02:00
scottashton 266f72a253 initial checkin for new graph module 2014-05-16 11:29:22 +02:00
scottashton b74a0b18e6 added tests to new jsoneditor function 2014-05-15 16:44:30 +02:00
Jan Steemann 978c6b1991 giving up 2014-05-15 16:28:14 +02:00
Jan Steemann 7b4f8d3fd9 try to fix test 2014-05-15 16:03:06 +02:00
Michael Hackstein d3ca063b4e Added click on top row for json-editor to insert initial attribute/value pair 2014-05-15 15:45:51 +02:00
Jan Steemann 8959d9df41 adjusted test 2014-05-15 12:35:23 +02:00
Jan Steemann 824cda67e2 fixed test 2014-05-15 10:45:40 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 2adeda7da3 restrict cap constraint for _statistics 2014-05-14 21:34:32 +02:00
Jan Steemann a69d93b7c9 fixed variable name 2014-05-14 21:14:15 +02:00
Jan Steemann 9984b341ac fixed comment 2014-05-14 21:12:58 +02:00
Frank Celler db566d53d9 added rewriteRequest 2014-05-14 20:15:12 +02:00
Jan Steemann ee8fe74a8a removed tabs 2014-05-14 17:41:00 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
scottashton 1d2fbb67ed removed tests 2014-05-14 15:44:20 +02:00
scottashton f79cd75081 Closes #851 2014-05-14 15:30:06 +02:00
Jan Steemann 8818a880bc added comments 2014-05-14 11:41:39 +02:00
Jan Steemann 2d36eb2473 removed name attribute 2014-05-14 09:47:48 +02:00
Jan Steemann 684bc82a5f fixed jslint warning 2014-05-13 18:18:32 +02:00
Jan Steemann eeedb022d0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-13 18:16:04 +02:00
Jan Steemann 299e05c0b2 fixed unrestricted queries in cluster dashboard 2014-05-13 18:15:34 +02:00
Max Kerp 2ff1218759 fixed JSLint 2014-05-13 17:59:05 +02:00
Max Kerp d0a40b8981 fixed the ace cursor bug by updating ace.js and 
setting the default font-family to courier new. Added firefox
support for the custom query name check feedback. This needs to go into
the stylesheets but i didnt't find a way to make this work just yet, cause i
don't know the styles well enough. Hope Michael or Heiko can help me
with this.
 2014-05-13 17:47:25 +02:00
Jan Steemann adf9092744 fixed jslint warnings 2014-05-13 14:05:59 +02:00
Max Kerp fcc223a1b1 Implemented a check for invalid query names. 
Now prohibiting saving names with special html characters while giving
visual feedback.
 2014-05-13 13:42:30 +02:00
Jan Steemann 4cf29af60a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-12 13:56:12 +02:00
Jan Steemann 204a16c224 fixed compiler warning 2014-05-12 13:55:58 +02:00
scottashton 00a4c8b27e fixed scss bug 2014-05-12 12:55:11 +02:00
scottashton 5b644570d9 fixed scsslint errors 2014-05-12 11:51:26 +02:00
scottashton 1bb91230f0 adjusted tests 2014-05-12 11:02:07 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Frank Celler e83c7b3a34 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-12 00:44:58 +02:00
Frank Celler c12831a361 fixed interval 2014-05-12 00:44:44 +02:00
Frank Celler 9127ed2ac5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-12 00:07:46 +02:00
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