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

1751 Commits

Author SHA1 Message Date
gschwab c42c9e3253 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 17:02:40 +02:00
gschwab 383e254414 new graph management 2014-06-24 17:02:36 +02:00
scottashton c46a916762 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:16:29 +02:00
scottashton b5aeea1109 fixed jslint 2014-06-24 16:16:25 +02:00
Jan Steemann cf14609727 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:12:07 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
gschwab f059dca594 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:09:46 +02:00
gschwab 8e514b2435 new graph management 2014-06-24 16:09:41 +02:00
scottashton bbb7068a08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:02:46 +02:00
scottashton e4f23d2b23 graph management 2014-06-24 16:02:40 +02:00
Frank Celler 840950c6a0 fixed printing of functions and example generation 2014-06-24 15:32:43 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
gschwab 44c11d3846 graph management: links changed 2014-06-24 14:08:48 +02:00
gschwab bab8ff0bde changing graph management - initial checkin 2014-06-24 14:06:27 +02:00
Alan Plum d50bd571f7 Trimmed line length. 2014-06-24 13:24:32 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
gschwab e049f85b44 docu 2014-06-24 11:54:42 +02:00
Jan Steemann 8d8dfe5cd0 added derived files 2014-06-24 00:44:25 +02:00
gschwab 56d8db54aa docu 2014-06-23 15:14:16 +02:00
Frank Celler 34908e450b hidden for http examples 2014-06-23 14:04:16 +02:00
gschwab 0b09442ad9 typos 2014-06-23 13:44:04 +02:00
gschwab 35b645ba1a deleted print O.o 2014-06-23 13:23:09 +02:00
gschwab 19191b5a1b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:20:18 +02:00
gschwab 4651fbd34a deleted print 2014-06-23 13:20:12 +02:00
Michael Hackstein 658fa5cc25 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 13:18:06 +02:00
Michael Hackstein 273eaf95fb Added graph specific deprecation information to DEPRECATED.md 2014-06-23 13:17:20 +02:00
scottashton fa2084ea9b fixed bug in commonPorperties, now attributes with the value of 'false' are included in result, fixed js shell to full general-graph support 2014-06-23 11:37:43 +02:00
Frank Celler c21c1d9a46 added underscore 2014-06-23 10:44:16 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
gschwab 69df68c54e renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:47:48 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Heiko Kernbach 07f01f90d3 jslint 2014-06-20 17:21:54 +02:00
Heiko Kernbach 8c66875f97 alerting user now when newest version of github foxx app is already installed 2014-06-20 17:03:24 +02:00
gschwab 34cd589908 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:19:04 +02:00
gschwab 28b5f27ca6 error added 2014-06-20 16:18:58 +02:00
Heiko Kernbach 6afee10309 jslint 2014-06-20 16:11:43 +02:00
Heiko Kernbach fcb4d7c513 merge 2014-06-20 16:09:33 +02:00
Heiko Kernbach 7aaaa88f85 added github update for foxx applications via frontend 2014-06-20 16:09:13 +02:00
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Michael Hackstein 707c79d5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 15:07:29 +02:00
Frank Celler 5ac431a453 generated files 2014-06-20 15:06:18 +02:00
Heiko Kernbach 5ef874f8f3 merge 2014-06-20 14:58:30 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +02:00
Jan Steemann be0b4b8c6e remove definePeriodic 2014-06-20 14:45:14 +02:00
Jan Steemann b9c688d117 removed doxygen comments 2014-06-20 14:39:05 +02:00
Jan Steemann e51dcdb2cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-06-20 13:39:51 +02:00
Heiko Kernbach 39cf260ff2 better usability for foxx github installer 2014-06-20 11:40:38 +02:00
Heiko Kernbach 6191403181 jslint 2014-06-20 10:35:40 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab ff3e0442a9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 08:57:04 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Michael Hackstein 79ad6f60af Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 08:38:11 +02:00
Michael Hackstein 407496c111 Added new version of traversal and general graph to web ui shell. Needs testing 2014-06-20 08:38:07 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Frank Celler 8cd9e257db ignore devel version for version check 2014-06-18 17:06:15 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
gschwab 6dc18982aa graph._removeVertexCollection(...): dropCollection default set to false 2014-06-18 10:50:07 +02:00
gschwab 7366e8a6d9 renamed removeOrphanCollection(..) -> removeVertexCollection(..) 2014-06-18 09:29:34 +02:00
gschwab 903dce0fbf renamed getOrphanCollections() -> orphanCollections() 2014-06-18 09:01:04 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Alan Plum de9750cf21 Fixed hmac comments. 2014-06-17 13:25:07 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
Jan Steemann 297b4bfac4 added derived files 2014-06-17 00:53:36 +02:00
Jan Steemann 02d171412d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-16 14:47:41 +02:00
gschwab 7318417cf8 made make 2014-06-16 14:36:28 +02:00
gschwab 229834f5a4 fixed merge conflicts 2014-06-16 14:27:47 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Michael Hackstein fdd2b6f791 Moved newest version of general graph into web interface 2014-06-16 09:09:05 +02:00
Jan Steemann 3301813f3c added missing client-side function 2014-06-13 21:39:35 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Michael Hackstein b986d7baf6 Fixes #894 in Safari + Chrome. Firefox is broken due to a bug in our jQuery version (offset is returning a random value...). IE to be tested. 2014-06-13 17:32:28 +02:00
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
Jan Steemann 1eb39674ef added is.js to frontend 2014-06-13 10:22:18 +02:00
Jan Steemann 8843761c0e fixed issue #900 2014-06-12 17:15:35 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
gschwab 3556868659 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 14:52:10 +02:00
gschwab 4bc2905f29 added extend and edit functions for edgeDefinitions of existing graphs 2014-06-11 14:51:26 +02:00
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +02:00
Heiko Kernbach 768822709e version control for foxx apps 2014-06-10 18:09:42 +02:00
Heiko Kernbach eb08541171 foxx apps install now via github 2014-06-10 15:21:27 +02:00
Heiko Kernbach 0f21f69082 userManagementViewSpec added 2014-06-06 15:32:07 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Frank Celler eda4b0cde4 fixed dfdb 2014-06-04 11:02:42 +02:00
Heiko Kernbach 507a6fe1c9 moved dropdown divider for database selection to the right place 2014-06-03 13:57:37 +02:00
Heiko Kernbach 42faa8af1b shortcut style and position changed 2014-06-03 11:59:33 +02:00
Heiko Kernbach 5731d38f94 removed shift keybinding for info modal 2014-06-03 11:44:22 +02:00
Heiko Kernbach 4308ddcc7f changed mouse style when hovering on navigation-dropdown-items 2014-06-03 11:37:19 +02:00
Heiko Kernbach 1d08dbb7b5 changed dropdown-item:hover to default style 2014-06-03 11:17:51 +02:00
gschwab efd057f021 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 09:43:57 +02:00
gschwab 0169a4817d error handling 2014-06-02 09:43:55 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Frank Celler 55b2cc6c54 fixed issue #881: [2.1.0] Bombarded (every 10 sec or so) with "WARNING format string is corrupt" when in non-system DB Dashboard 2014-05-31 13:19:58 +02:00
Jan Steemann 603de4ba20 javascript cleanup 2014-05-31 01:44:47 +02:00
Michael Hackstein c085a24d15 Fixed scss-lint warnings 2014-05-28 23:39:28 +02:00
gschwab 1fc4060899 edgeCollection may only be used in equal edge definitions 2014-05-28 15:45:03 +02:00
Jan Steemann 01358527e3 fixed jslint warning 2014-05-28 09:20:13 +02:00
Heiko Kernbach b74d85a355 query specs 2014-05-27 18:23:59 +02:00
Heiko Kernbach 3625ce4840 merge 2014-05-27 18:08:46 +02:00
Heiko Kernbach 5cfa08c8bd queryViewSpec for jasmine added 2014-05-27 18:08:26 +02:00
Esteban Lombeyda d278fdc28e Bug fix: in updateByExample 2014-05-27 16:27:03 +02:00
Esteban Lombeyda e665a4cce8 bug fix: wrong parameter name 2014-05-26 15:41:55 +02:00
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
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 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 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 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 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
Jan Steemann e3f7df878e added derived file 2014-05-16 19:06:16 +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 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 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 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
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 16600971b2 Working on the custom query manager 2014-05-09 17:23:57 +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 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 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 f7c9b68807 Fixed resize handling for graph viewer 2014-05-07 21:48:09 +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
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
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
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
Heiko Kernbach e5139f3e84 100% coverage of navigationView 2014-05-06 14:45:43 +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