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

2082 Commits

Author SHA1 Message Date
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00
Esteban Lombeyda a803c16016 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 10:56:17 +02:00
Frank Celler 0f70998408 fixed merge errors 2014-05-25 23:47:29 +02:00
Frank Celler ea49ba807c fixed cluster statistics 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-05-25 23:34:25 +02:00
Claudius Weinberger 7c00fad11a cluster dashboard changes 2014-05-25 23:33:38 +02:00
Claudius Weinberger 15c594dc67 cluster dashboard changes 2014-05-25 23:33:29 +02:00
Michael Hackstein 841f01e390 Added a close button to cluster popup 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_modals.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:33:05 +02:00
Claudius Weinberger e6ff2d135d cluster dashboard changes 2014-05-25 23:32:20 +02:00
Claudius Weinberger 68e9316a12 cluster dashboard changes 
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:32:07 +02:00
Michael Hackstein dd28af0d3a Fixed style of new dashboard in cluster overview on click 
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:25:51 +02:00
Michael Hackstein b57192aee3 Fixed position of enlarge button, and added option to show it for other charts, all enabled now because of missing history 2014-05-25 23:14:36 +02:00
Claudius Weinberger d8a46ce84c dashbaord design changes 2014-05-25 23:14:16 +02:00
Claudius Weinberger 4728a7cd45 dashbaord design changes 
Conflicts:
	js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
 2014-05-25 23:13:56 +02:00
Michael Hackstein 73c27fcd36 Moved the enlarge icon of dashboard-charts to top right corner 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:12:42 +02:00
Michael Hackstein a87330e4a6 Fixed a bug in dashboard. The legend in Modalviews was selected before they existed 2014-05-25 23:11:10 +02:00
Frank Celler aa3a0c2896 cleanup cluster dashboard 2014-05-25 23:10:34 +02:00
Frank Celler db2a843252 fixed cluster view and history 2014-05-25 23:10:24 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
 2014-05-25 23:10:10 +02:00
Frank Celler 1a9b7056c7 generated files 2014-05-25 23:02:39 +02:00
Heiko Kernbach c6225a659e jslint 2014-05-23 18:56:30 +02:00
Heiko Kernbach f409dc86a9 added collectionsitemviewspec karma 2014-05-23 18:50:41 +02:00
Heiko Kernbach 540f5b53c2 added missing shortcuts event 2014-05-23 17:09:33 +02:00
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +02:00
Heiko Kernbach 820d47a790 added jasmine spec for shell view 2014-05-23 16:20:22 +02:00
Heiko Kernbach d19302e50e #853 - fixed disabled info icon issue 2014-05-23 10:19:14 +02:00
Esteban Lombeyda 9774991e31 strong examination of function parameters 2014-05-22 15:41:21 +02:00
Esteban Lombeyda f8c330ce54 Supporting new signature for replace function 2014-05-22 10:31:01 +02:00
Esteban Lombeyda 4af97257b9 Buf fix: Java Script Syntax error 2014-05-21 12:51:25 +02:00
Esteban Lombeyda 32aee78f7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 11:53:34 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
Jan Steemann 11ea87f8fc issue #866: Recurrent/obtrusive "No statistical data yet" popup 2014-05-20 17:48:39 +02:00
Jan Steemann 369ffd7788 issue #866: Recurrent/obtrusive "No statistical data yet" popup 2014-05-20 17:08:47 +02:00
Max Kerp 13c3b80976 clean up 2014-05-20 15:17:51 +02:00
Max Kerp b11cffa1c9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 14:53:48 +02:00
Max Kerp 8dd3babebd fixed scss-lint 2014-05-20 14:53:05 +02:00
Max Neunhoeffer 464b6720ca Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:10 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +02:00
Jan Steemann 7d7396a0a8 added derived file 2014-05-20 11:50:42 +02:00
Max Kerp 9ca0447b69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 11:39:18 +02:00
Max Kerp a1feb3e19e implemented a form-validation for text-inputs, now 
prohibiting the user to save custom AQl queries containing special html
characters.
 2014-05-20 11:36:18 +02:00
Max Kerp 9a2566ad4c fixed the bug that the number of total documents wasn't updated 
when deleting a document and modified the test.
 2014-05-20 11:24:31 +02:00
Jan Steemann 63b287157f jshund 2014-05-17 00:55:37 +02:00
Jan Steemann 0ca849efb9 emit buffer to prevent very big string allocations/reallocations 2014-05-17 00:12:32 +02:00
Jan Steemann 1c6f63bad0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 20:13:33 +02:00
Jan Steemann a0ffb65b88 emit output of print function to prevent buffering of super-long strings 2014-05-16 20:11:31 +02:00
Heiko Kernbach 6582ce9b8a merge 2014-05-16 20:02:29 +02:00
Heiko Kernbach 71f8619ede karma 2014-05-16 20:01:26 +02:00
Heiko Kernbach 8aa7120dbb jslint 2014-05-16 20:01:07 +02:00
Heiko Kernbach 8172666dbb added new indicator for shortcuts help 2014-05-16 19:47:43 +02:00
Heiko Kernbach 2eaac09ec4 added hotkey modal template to manifest.json 2014-05-16 19:36:57 +02:00
Heiko Kernbach e14c87f0d7 added template for hotkeys modal 2014-05-16 19:36:37 +02:00
Heiko Kernbach 9d3b292183 new scss file for hotkeys modal 2014-05-16 19:36:23 +02:00
Heiko Kernbach a0bbd238c3 added global shortkey helper - press question mark + shift 2014-05-16 19:35:51 +02:00
Heiko Kernbach 02680a4c15 fixed arangoSpec 2014-05-16 19:35:25 +02:00
Jan Steemann e3f7df878e added derived file 2014-05-16 19:06:16 +02:00
Heiko Kernbach b4ecbff331 fixed collections logs spec 2014-05-16 15:35:56 +02:00
Heiko Kernbach bb92ebe4fc merge 2014-05-16 13:12:23 +02:00
Heiko Kernbach 70a7f1a45c removed shellviewspec from json 2014-05-16 13:11:21 +02:00
gschwab 6451af1cb4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 13:10:31 +02:00
gschwab 24871b64ef start implement edges() 2014-05-16 13:08:33 +02:00
Heiko Kernbach 969826af27 jslint 2014-05-16 13:01:34 +02:00
Heiko Kernbach 4cb82ee0b1 logs bugfix 2014-05-16 12:58:25 +02:00
Heiko Kernbach fc8003b4d7 fixed logs spec 2014-05-16 12:26:47 +02:00
Heiko Kernbach 903b3aaaeb temp commented out 2014-05-16 12:21:21 +02:00
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 b74a0b18e6 added tests to new jsoneditor function 2014-05-15 16:44:30 +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
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann a69d93b7c9 fixed variable name 2014-05-14 21:14:15 +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 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
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 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
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
scottashton dfbe827525 more tests 2014-05-09 16:23:17 +02:00
scottashton 7433d6bf35 disabled useSSLonCoordinators, currently not supported 2014-05-09 14:15:44 +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
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 92f02fbce3 Fixed design bugs in graph viewer 2014-05-08 19:09:17 +02:00
scottashton 31355e7aca showClusterView tests 2014-05-08 15:16:45 +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
Frank Celler 755558d734 removed old files 2014-05-08 11:45:53 +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 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
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
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
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 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