1
0
Fork 0
Commit Graph

1534 Commits

Author SHA1 Message Date
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +02:00
Heiko Kernbach 812b93d9d0 merge 2014-06-10 15:21:47 +02:00
Heiko Kernbach eb08541171 foxx apps install now via github 2014-06-10 15:21:27 +02:00
scottashton d70688c61f stabilized tests 2014-06-10 11:55:43 +02:00
Michael Hackstein fdb79e26d1 The foxx manager now throws a more useful error if the fetched file is already on the server 2014-06-06 15:40:19 +02:00
Michael Hackstein 920cf4b7c3 Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark 2014-06-06 15:00:26 +02:00
Jan Steemann fd7f288a59 added test case for shape movements 2014-06-05 22:23:02 +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
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
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
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
Alan Plum d9fa68a493 Whitelist metadata attributes in forDB. Fixes #877. 2014-06-02 13:08:16 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann f5eb65c96c javascript cleanup 2014-05-31 01:53:30 +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
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
Esteban Lombeyda 84b31d49da functions byExample was documented 2014-05-28 11:12:32 +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
Esteban Lombeyda d278fdc28e Bug fix: in updateByExample 2014-05-27 16:27:03 +02:00
Esteban Lombeyda 785f374a5e Big fix: wrong use of undefined 2014-05-27 14:36:14 +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 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
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 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 ea49ba807c fixed cluster statistics
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
2014-05-25 23:34:25 +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 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
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +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