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

5661 Commits

Author SHA1 Message Date
Michael Hackstein ec5a8eec1f Fixed tests for gharial adapter. They did use the old format 2014-06-26 16:55:45 +02:00
Michael Hackstein 68309a2d83 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:40:03 +02:00
Michael Hackstein 8664ab279a Added rudimentary implementation for storing vertices and edges in graph viewer. Dialog has to be improved and error handling required 2014-06-26 16:39:52 +02:00
Esteban Lombeyda 5206610e18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:39:09 +02:00
Esteban Lombeyda 5d162c0b3c moving some nonccluster tests to a new file 2014-06-26 16:38:08 +02:00
Jan Steemann 71f8b58e1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 16:27:02 +02:00
Jan Steemann cea36cf8b4 less randomness 2014-06-26 16:26:50 +02:00
Jan Steemann a8e1aabd40 renamed test file 2014-06-26 16:19:22 +02:00
Michael Hackstein dc7ffb4efb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:13:38 +02:00
Michael Hackstein 1739339883 Addapted gharial adapter to new traversal result 2014-06-26 16:13:31 +02:00
Jan Steemann 0ed55b132b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 16:02:15 +02:00
Jan Steemann c8978771c0 exclude test in cluster mode 2014-06-26 16:02:08 +02:00
gschwab a205a49f1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-26 15:57:53 +02:00
gschwab 95e60c069b edit graph 2014-06-26 15:54:50 +02:00
scottashton 926c301cd2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 15:51:22 +02:00
scottashton 357be2cbbe adjusted tests for new graph management 2014-06-26 15:51:11 +02:00
Esteban Lombeyda 4569420fda all file for tesing the changeMode werde renamed 2014-06-26 15:42:17 +02:00
scottashton de7fe5f2ba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 15:10:29 +02:00
scottashton d610cf9107 finally managed to disable the enter button in create graph modal 2014-06-26 15:10:23 +02:00
Esteban Lombeyda 0c2376dead Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 14:58:36 +02:00
Esteban Lombeyda ef111c0f6e changeMode test is execute only in noncluster environoments 2014-06-26 14:57:01 +02:00
scottashton d3657a6dec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 14:05:25 +02:00
scottashton daceb0e1b1 preselct defintions if available 2014-06-26 14:05:20 +02:00
Thomas Schmidts 3eae1a4751 Exchanged verbinclude with Arangosh for bett examples in gitbook 2014-06-26 13:41:17 +02:00
Jan Steemann eec6012318 increased wait time 2014-06-26 13:18:30 +02:00
Jan Steemann 96569367d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.cpp
 2014-06-26 13:07:53 +02:00
Jan Steemann 1bb171787f clean up when journal creation fails 2014-06-26 13:03:45 +02:00
Frank Celler 13f91392bb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 12:51:00 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
gschwab caf54c1bbf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-26 12:44:47 +02:00
gschwab 059093c7a4 add graph - iteration fixed 2014-06-26 12:43:12 +02:00
Jan Steemann 9f37a21729 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 12:37:11 +02:00
scottashton 1bc4864090 merged 2014-06-26 12:01:17 +02:00
scottashton de0da1e7b7 changed signature of the traversal functions 2014-06-26 11:55:35 +02:00
Michael Hackstein 8627815c26 The GraphViewer now starts with _key colouring and labeling 2014-06-26 11:55:00 +02:00
Jan Steemann 183469227c fixed rollback of updates 2014-06-26 11:38:41 +02:00
gschwab c35677b0a1 edit graph 2014-06-26 11:13:04 +02:00
gschwab 8440bc916e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 11:07:40 +02:00
gschwab c941cfa76c edit graph 2014-06-26 11:07:35 +02:00
Michael Hackstein 97309a837b The graphviewer will now start with a random vertex 2014-06-26 10:54:07 +02:00
Michael Hackstein 4d1357c465 I broke the build and fixed it. Sorry... 2014-06-26 10:31:12 +02:00
Michael Hackstein f2705d98cb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 10:17:10 +02:00
Michael Hackstein 5dbf4d1306 Started adding the graph viewer into the new graph management overview. Right now it is possible to show a graph by selecting a start node by its id. Not yet working: Search, start with random, create vertices and edges 2014-06-26 10:17:00 +02:00
gschwab 1d53c8841f removed dead code 2014-06-26 10:09:00 +02:00
gschwab 00f687452c graph management - multi edge definitions 2014-06-26 09:50:58 +02:00
gschwab 3d1a7f35b5 graph management - multi edge definitions 2014-06-26 09:37:28 +02:00
scottashton ae53a8c7c9 fixed tests 2014-06-26 09:34:56 +02:00
Michael Hackstein b9ae84cfad Added click events to all graph tiles in management. Needed later to integrate the graph viewer 2014-06-26 09:34:44 +02:00
scottashton 25ae2ced5e merge conflict 2014-06-26 09:08:31 +02:00
scottashton a8c4af2921 graph creation works 2014-06-26 09:07:12 +02:00