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

13335 Commits

Author SHA1 Message Date
gschwab dc0c91c038 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 09:25:29 +02:00
gschwab e955d27f7b arango-blueprints updated to use new graph sturcture 2014-05-28 09:22:35 +02:00
Jan Steemann 01358527e3 fixed jslint warning 2014-05-28 09:20:13 +02:00
Esteban Lombeyda a278d96f02 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-28 08:49:41 +02:00
Esteban Lombeyda 42525b2858 checking header file of DummyShell. This shell is not in use 2014-05-28 08:48:28 +02:00
Heiko Kernbach b74d85a355 query specs 2014-05-27 18:23:59 +02:00
Heiko Kernbach 0fd70779b5 added queryViewSpec to files.json 2014-05-27 18:09:33 +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 a1eed266fd Bug fix: sending data in correct format 2014-05-27 15:49:44 +02:00
Esteban Lombeyda 785f374a5e Big fix: wrong use of undefined 2014-05-27 14:36:14 +02:00
Esteban Lombeyda ca911c9245 Bug Fix: replaceByExample 2014-05-27 14:01:18 +02:00
Jan Steemann b876bfd34f fixed typos 2014-05-27 11:04:10 +02:00
gschwab 87d992a9c4 jslint 2014-05-26 16:51:48 +02:00
Esteban Lombeyda 4e7af1f2e6 using correct parameter name (jslint thanks) 2014-05-26 16:15:38 +02:00
Esteban Lombeyda 8353af15eb renaming test method and cleaning 2014-05-26 16:07:47 +02:00
Esteban Lombeyda decb3944b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 15:42:33 +02:00
Esteban Lombeyda e665a4cce8 bug fix: wrong parameter name 2014-05-26 15:41:55 +02:00
Esteban Lombeyda 5cc5d16645 Bug fix: yielding correct format for option parameters 2014-05-26 15:39:47 +02:00
gschwab 43009ce97c added update for _graphs to replace old graph definitions to new ones (containing edgeDefinitions) 2014-05-26 15:22:17 +02:00
Esteban Lombeyda 3df7990827 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 15:17:53 +02:00
Jan Steemann 1351de4523 fixed invalid collection / document access 2014-05-26 15:17:36 +02:00
Esteban Lombeyda 4902080680 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 14:42:49 +02:00
Jan Steemann 6c7643a4fd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 13:49:44 +02:00
Esteban Lombeyda c563756a35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:44:12 +02:00
gschwab ec7c7659e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 13:43:51 +02:00
gschwab c6c9335442 fixed check 2014-05-26 13:43:47 +02:00
Jan Steemann bc620aecb9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 13:19:16 +02:00
Jan Steemann 0e0b6f34f5 fixed requestTimeout 2014-05-26 13:18:58 +02:00
Michael Hackstein 63113a84ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:10:37 +02:00
Michael Hackstein f49826afd9 Better integrated neighbors into fluent AQL of graphs. Yet missing in AQL: Give examples of target verticies 2014-05-26 13:10:23 +02:00
Esteban Lombeyda 7840b42358 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 12:40:21 +02:00
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00
gschwab d01fa951c2 some error handling added 2014-05-26 11:41:35 +02:00
Esteban Lombeyda a803c16016 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 10:56:17 +02:00
gschwab 3ed6b73702 remove edge will remove other edges used as from or to recursively 2014-05-26 10:37:56 +02:00
gschwab ba6e70f5c6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 09:45: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