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

5221 Commits

Author SHA1 Message Date
Frank Celler 4c2adf9f54 removed .showHotkeyHelp 2014-06-04 16:06:01 +02:00
Michael Hackstein d1ef96a801 Added further docu to general graph and removed unused functions 2014-06-04 14:32:47 +02:00
Jan Steemann ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +02:00
Michael Hackstein d17d1908e9 Made internal attributes of general graph objects non-enumerable to hide them from the user. 2014-06-04 14:10:20 +02:00
Michael Hackstein 808a34510f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 13:49:53 +02:00
Michael Hackstein 44a3dd1db1 Added start of documentation move to gitbooks in general graphs 2014-06-04 13:06:31 +02:00
gschwab 73c3d9cfec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-04 12:36:29 +02:00
gschwab 7590652d57 fixed neighbors 2014-06-04 12:36:21 +02:00
Michael Hackstein 7e511ddaa9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 11:49:33 +02:00
Frank Celler eda4b0cde4 fixed dfdb 2014-06-04 11:02:42 +02:00
Michael Hackstein decd8e0c91 Added documentation for cursor behaviour in fluent AQL interface for graphs 2014-06-04 10:57:29 +02:00
Michael Hackstein ef94b4a9bb Added more documentation to fluent AQL interface in graphs 2014-06-04 10:47:27 +02:00
Jan Steemann 63f982bc6b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 18:12:51 +02:00
Frank Celler 8dc8600eb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/model.js
 2014-06-03 17:20:18 +02:00
Frank Celler 44aefb2344 added mountedApp 2014-06-03 17:19:03 +02:00
Jan Steemann 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
scottashton 5ef0371ad6 make jslint stop nagging 2014-06-03 16:31:44 +02:00
scottashton af4d4e6d25 make jslint stop nagging 2014-06-03 16:30:23 +02:00
gschwab 859f104c5d jslint 2014-06-03 16:29:46 +02:00
scottashton 8f347f2b54 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:25:26 +02:00
scottashton 006eb3b61b calculation of measurements for graphs added and changed calculation of shortst paths to Floyd–Warshall algorithm 2014-06-03 16:25:13 +02:00
gschwab d4058d5aba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:08:48 +02:00
gschwab 6166c6bff5 path function for fluent interface added 2014-06-03 16:08:42 +02:00
Frank Celler 2b29c627cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-03 15:56:58 +02:00
Frank Celler 2dfe5ceb76 only use next action if not restarting 2014-06-03 15:52:41 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +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 6ffb0ef26d merge 2014-06-03 11:34:29 +02:00
Heiko Kernbach 1d08dbb7b5 changed dropdown-item:hover to default style 2014-06-03 11:17:51 +02:00
Jan Steemann a9a12e42c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	Makefile.am
 2014-06-03 10:18:08 +02:00
Frank Celler e6d7f438cb Merge pull request #885 from pluma/require-submodules 
Added fallback to allow requiring submodules (fixes #789)
 2014-06-03 09:42:48 +02:00
Frank Celler 2ac20c5195 Merge pull request #884 from pluma/foxx-models-io 
Better Foxx.Model attribute handling (fixes #877 and #878)
 2014-06-03 09:39:51 +02:00
Jan Steemann 8688ae6b87 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 09:31:52 +02:00
Michael Hackstein f0084fa116 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/api-simple.js
 2014-06-02 17:35:15 +02:00
Michael Hackstein 3e00b6aa30 Started with the documentation of the fluent interface in graphs module. Added documents accordingly. 2014-06-02 17:32:50 +02:00
gschwab 3746cfa1c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 16:57:25 +02:00
gschwab 062c6649e2 remove is transactional now 2014-06-02 16:57:20 +02:00
Jan Steemann 687b2b128b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.cpp
 2014-06-02 16:31:55 +02:00
Alan Plum 6e33c8966b Fallback for sub-module requires. Fixes #789. 2014-06-02 15:01:37 +02:00
Alan Plum d9fa68a493 Whitelist metadata attributes in forDB. Fixes #877. 2014-06-02 13:08:16 +02:00
Esteban Lombeyda 02f119475b Bug Fix in examples (make examples) 2014-06-02 12:06:33 +02:00
gschwab c6191a27ff Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 11:00:18 +02:00
gschwab 4f6e85faf8 fixed tests 2014-06-02 10:58:35 +02:00
Jan Steemann 6283a9618e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 10:42:09 +02:00
Michael Hackstein 2ad5a1971a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-02 10:39:14 +02:00
Michael Hackstein 3ccac40d50 Added _PRINT for Graph and Fluent AQL Interface 2014-06-02 10:38:59 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 2014-06-02 09:52:05 +02:00
gschwab 638940dd54 jslint 2014-06-02 09:46:09 +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 f5eb65c96c javascript cleanup 2014-05-31 01:53:30 +02:00
Jan Steemann 603de4ba20 javascript cleanup 2014-05-31 01:44:47 +02:00
Heiko Kernbach 982f820d99 added tests for collectionsItemView 2014-05-30 16:16:41 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Frank Celler 443cc769ac updated node modules 2014-05-29 10:03:18 +02:00
Michael Hackstein c085a24d15 Fixed scss-lint warnings 2014-05-28 23:39:28 +02:00
Michael Hackstein d8889bc6a7 Fixed Document statistic spec and JSLint 2014-05-28 23:08:04 +02:00
Michael Hackstein f44ebf0953 Fixed dashboard view spec 2014-05-28 22:52:39 +02:00
Michael Hackstein 8164026b65 Started fixing tests for dashboard 2014-05-28 22:49:04 +02:00
Michael Hackstein cfc171dbbe Fixed dashboard config test 2014-05-28 22:19:37 +02:00
Michael Hackstein 3d56f8383d Started fixing dashboard config tests 2014-05-28 22:13:43 +02:00
Michael Hackstein 867ace8ece Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-28 21:48:27 +02:00
Michael Hackstein 5228984679 Fixed graph tests 2014-05-28 21:48:22 +02:00
Jan Steemann d8c2288341 simplified sort function 2014-05-28 21:11:37 +02:00
Jan Steemann 7caee50818 less function calls 2014-05-28 18:34:23 +02:00
gschwab 8a7a1800f0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 15:45:10 +02:00
gschwab 1fc4060899 edgeCollection may only be used in equal edge definitions 2014-05-28 15:45:03 +02:00
Max Neunhoeffer 49a76d18a8 IsHealthy for clusters on client of dispatcher. 2014-05-28 15:44:08 +02:00
Jan Steemann 7037ef27cc added derived file 2014-05-28 15:20:32 +02:00
Max Neunhoeffer 9c4188e42b Document cluster upgrade procedure. 2014-05-28 15:17:29 +02:00
Max Neunhoeffer c53f17f66a Implement cluster upgrade in Kickstarter. 2014-05-28 15:17:19 +02:00
gschwab 8373ae3c28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 13:38:12 +02:00
gschwab 59e61298ea removing an vertex will now remove its edges recursively 2014-05-28 13:38:05 +02:00
Esteban Lombeyda 84b31d49da functions byExample was documented 2014-05-28 11:12:32 +02:00
Esteban Lombeyda fa9a7263a8 more documentation yet 2014-05-28 10:53:00 +02:00
Esteban Lombeyda 6d76e8c6ac Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-28 10:29:45 +02:00
Esteban Lombeyda a4a4d770b6 more documentation 2014-05-28 10:29:10 +02:00
scottashton 7119cfd5fb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 09:59:15 +02:00
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +02:00
gschwab a0f8e9d166 check, if edge is already used in a definition 2014-05-28 09:40:48 +02:00
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
Jan Steemann 74ccb66d59 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-28 09:17:55 +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
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +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 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
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
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 ecd5641d03 added i/o stats 2014-05-25 23:11:03 +02:00
Frank Celler 0e0773a161 added gc for statistics 2014-05-25 23:10:56 +02:00
Frank Celler 4c160be4a6 remove old stats 2014-05-25 23:10:49 +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
gschwab 315aa52053 jslint 2014-05-23 17:22:11 +02:00
gschwab 49253e338b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-05-23 17:15:50 +02:00
gschwab 1423197564 removing edges: recursive remove, when edge is used as vertex 2014-05-23 17:10:44 +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 b6f316e4e6 merge 2014-05-23 16:22:02 +02:00
Heiko Kernbach 820d47a790 added jasmine spec for shell view 2014-05-23 16:20:22 +02:00
Michael Hackstein 03c91573c1 Merged my offline state for general graphs and included all the tests, everything is green. Fluent interface is on a good way 2014-05-23 15:54:39 +02:00
Michael Hackstein 9505f95abb Added some more variables to replace plain strings 2014-05-23 15:11:29 +02:00