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

1938 Commits

Author SHA1 Message Date
Alan Plum eaf855d964 Documentation method syntax. 2014-07-05 16:05:55 +02:00
Alan Plum 61909ccd23 Added tests for Repository index magic. Fixes #899. 2014-07-04 17:09:50 +02:00
Alan Plum 40448d69cc Consistency in docs. 2014-07-04 17:08:34 +02:00
Alan Plum 2f1ef93574 Allow using Repository::all without arguments. 2014-07-04 17:08:34 +02:00
Alan Plum f1d0124a0f Added index-specific repository methods. 2014-07-04 17:08:34 +02:00
Jan Steemann 772f5fc876 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-04 13:52:45 +02:00
Jan Steemann 6f4ab77d9b fixed WAL collector moving markers 2014-07-04 13:52:31 +02:00
Alan Plum b5442e1ec8 Whitelist metadata in Model::set. 2014-07-04 11:15:56 +02:00
Alan Plum 391810aa61 Don't throw in Model::get. 2014-07-04 11:15:56 +02:00
Jan Steemann 96b195a34d added test 2014-07-04 08:06:02 +02:00
Jan Steemann 04ed18be47 recovery 2014-07-03 22:50:22 +02:00
Jan Steemann 470839ffb9 fixed tests 2014-07-03 18:51:40 +02:00
Jan Steemann 6fc0c051d0 added test case 2014-07-03 17:12:25 +02:00
Jan Steemann d5e4f6762c foxx-directories test 2014-07-03 12:58:02 +02:00
Lucas Dohmen f9360c2577 Merge pull request #927 from triAGENS/foxx-model-set-validation 
FoxxModel.set validation
 2014-07-03 07:49:33 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Alan Plum 299cfd80fe Replaced ES5 methods with underscore because reasons. 2014-07-02 17:14:03 +02:00
Alan Plum e3baa87072 Coding style. 2014-07-02 17:14:03 +02:00
Alan Plum e1aa528295 Added tests for bad model attribute setting. 2014-07-02 17:14:02 +02:00
Alan Plum 7b56ff643f Linting. 2014-07-02 17:14:02 +02:00
Alan Plum 19edeb18ba Implemented simple validation in FoxxModel.set 2014-07-02 17:14:02 +02:00
Jan Steemann 8a36d58524 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 16:53:30 +02:00
Jan Steemann d4858f90d3 added test for renaming 2014-07-02 16:53:23 +02:00
Thomas Schmidts e46d87f23c Changed documentation code in configure chapter 2014-07-02 14:08:41 +02:00
Jan Steemann a46ac4a8a2 removed mruby 2014-07-02 13:32:07 +02:00
Max Neunhoeffer da4ca4a6b5 Fix bug in disabling of tests. 2014-07-02 11:37:56 +02:00
Max Neunhoeffer ad767b5aee Implement disabling of client tests. 2014-07-02 11:32:38 +02:00
Jan Steemann 28965618d1 handle renaming of collections 2014-07-02 10:28:43 +02:00
Jan Steemann 84ef51aaf4 handle properties marker 2014-07-02 09:54:28 +02:00
Jan Steemann ab70cfb9bb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 09:31:17 +02:00
Jan Steemann 7fa01da9b4 handle empty logfiles on startup 2014-07-02 09:31:00 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0a230b77e3 jshund 2014-07-02 00:17:25 +02:00
Jan Steemann a5cf53d417 fixed examples 2014-07-01 16:48:47 +02:00
Alan Plum 1624c6a1b8 Formatting. 2014-07-01 15:08:38 +02:00
Alan Plum 1d497135cf Allow specifying config options when mounting apps in aardvark. 2014-07-01 14:35:08 +02:00
Max Neunhoeffer 140072a8f0 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:21:06 +02:00
Max Neunhoeffer 7fb712c681 Fix create collection in cluster really. 2014-07-01 13:20:45 +02:00
Jan Steemann 815bb8480a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:12:47 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
Max Neunhoeffer 89654b68cd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-01 11:47:25 +02:00
Max Neunhoeffer 351da7709d Fix bug in creation of sharded collections in cluster. 2014-07-01 11:47:09 +02:00
Jan Steemann 9469513170 remove replication collection 2014-07-01 11:36:13 +02:00
Jan Steemann c28b672fe5 fixed test 2014-07-01 11:35:57 +02:00
Jan Steemann 41008dab3a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 19:00:42 +02:00
Jan Steemann d55626c038 xxx 2014-06-30 19:00:36 +02:00
Alan Plum 5b62aae51e Disambiguated "lifetime" in Foxx auth. 2014-06-30 17:55:18 +02:00
Alan Plum edf850ce87 Formatting, whitespace. 2014-06-30 17:43:59 +02:00
Max Neunhoeffer 4a37680d92 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-06-30 16:49:08 +02:00
Max Neunhoeffer 412abdea0b Implement arangodump/restore test in unittests for cluster. 
Not yet working completely.
 2014-06-30 16:48:33 +02:00
Michael Hackstein 2bb8ace423 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 15:28:18 +02:00
Michael Hackstein 4cb1cdd977 Added upgrade script for Foxx API endpoints 2014-06-30 15:27:26 +02:00
Thomas Schmidts d9b733b997 Fixes some documentation pages for API. fixes #922 2014-06-30 14:22:17 +02:00
Jan Steemann 9d0f781289 jslint 2014-06-30 13:56:03 +02:00
Jan Steemann d3f8f1b8e0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:52:19 +02:00
Max Neunhoeffer 5fa0b5f54d Recognise Jasmin tests for shell_server tests in JS framework. 2014-06-30 13:16:05 +02:00
Jan Steemann d6a93a5535 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:07:56 +02:00
Jan Steemann bda2db16da recovery and replication 2014-06-30 13:07:48 +02:00
Max Neunhoeffer 48762f3cc2 Add disabled tests. 
Disable shell-readonly test on server.
 2014-06-30 12:45:10 +02:00
Thomas Schmidts 52ad8fc702 Some changes in the documentation code for gitbook 2014-06-30 09:29:02 +02:00
Thomas Schmidts c263b2a5e1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-29 03:34:42 +02:00
Thomas Schmidts c2cb0d5a10 Some changes to the comments in the code 2014-06-29 03:34:22 +02:00
Jan Steemann 56a9361f9f fill secondary indexes after recovery only 2014-06-29 00:18:21 +02:00
Jan Steemann 21ea9b4d4b recovery tests 2014-06-28 01:58:06 +02:00
Jan Steemann 187a006db7 jslint 2014-06-27 19:26:18 +02:00
Jan Steemann e7aef1e468 be less chatty on upgrade / initialisation 2014-06-27 19:25:06 +02:00
Thomas Schmidts 22f7b8390b Changed documentation in code for Foxx 2014-06-27 14:30:39 +02:00
Thomas Schmidts 148f400991 Changed some (sub)chapters and fixed spelling errors 2014-06-27 11:02:10 +02:00
Thomas Schmidts dd9e29702c changed design of functions in documentation 2014-06-26 17:25:43 +02:00
Jan Steemann bb2818a210 added oversize marker tests 2014-06-26 17:16:36 +02:00
Jan Steemann cea36cf8b4 less randomness 2014-06-26 16:26:50 +02:00
Jan Steemann c8978771c0 exclude test in cluster mode 2014-06-26 16:02:08 +02:00
Jan Steemann 1bb171787f clean up when journal creation fails 2014-06-26 13:03:45 +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 de0da1e7b7 changed signature of the traversal functions 2014-06-26 11:55:35 +02:00
Jan Steemann 183469227c fixed rollback of updates 2014-06-26 11:38:41 +02:00
Frank Celler 9bfaeeebd0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 17:22:30 +02:00
Frank Celler 87e1e16ad9 execute setup for system apps 2014-06-25 17:22:24 +02:00
Thomas Schmidts a43e8e065d Some changes in the documentation code 2014-06-25 16:29:17 +02:00
Thomas Schmidts cba9529153 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 16:15:36 +02:00
scottashton 9d0399ee0e new templates for graph management 2014-06-25 16:08:21 +02:00
scottashton 235a438c0c finished documentation of complexity 2014-06-25 15:51:41 +02:00
Thomas Schmidts f005d676cb Some changes in the code documentation 2014-06-25 15:10:13 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
Frank Celler 291c92dbf3 renamed ReadOnly to NoCreate 2014-06-25 14:32:00 +02:00
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann 1ac957a5ac fixed indentation, copy&paste, incomplete and too complicated tests 2014-06-24 17:20:14 +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
Thomas Schmidts f4c6c97488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 16:09:27 +02:00
Esteban Lombeyda fab2e0b855 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 15:23:18 +02:00
Esteban Lombeyda fff305170e renaming test in order to run in only in non cluster environments 2014-06-24 15:22:24 +02:00
Jan Steemann a289c9aa78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 15:11:30 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Thomas Schmidts 0bf957ddd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 14:28:50 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
scottashton 3dc7188141 heal the build 2014-06-24 14:26:46 +02:00
scottashton 3ba8719173 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 13:13:09 +02:00
scottashton 4f01409c4b processed lucas feedback regarding aql docu 2014-06-24 13:13:01 +02:00
Jan Steemann 303378d8e2 honor `--server.disable-statistics` 2014-06-24 12:06:47 +02:00
Jan Steemann c17d550097 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 11:26:55 +02:00
Esteban Lombeyda 357183ce3e Bug fix in setUp function 2014-06-24 10:58:51 +02:00
Jan Steemann 98f87b1f80 write-throttling 2014-06-24 10:55:05 +02:00
Jan Steemann 9695b25673 added tests 2014-06-24 09:19:26 +02:00
Lucas Dohmen 9bf547374d JSLint 😊 2014-06-24 13:47:41 +08:00
Lucas Dohmen 04ddc2ba3c Review of GraphOperations 2014-06-24 13:29:14 +08:00
Lucas Dohmen d625e38acf Foxx Model: Also update whitelisted attributes 2014-06-24 13:29:14 +08:00
Jan Steemann 5ce280b5f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 00:38:33 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Thomas Schmidts 859ad4fbb0 Changes in the code documentation 2014-06-23 16:18:58 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
Lucas Dohmen c67b1d9d5a Foxx: Fix Model.fromClient 2014-06-23 14:43:58 +02:00
Lucas Dohmen f62ce6cd7f Foxx: Fix error for `body()` when body is empty 2014-06-23 14:16:13 +02:00
Lucas Dohmen 8831f91f9d Foxx Model: Allow to access the whitelisted attributes from ancestor 2014-06-23 13:52:29 +02:00
scottashton 7efc5b77cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:35:01 +02:00
scottashton 371bfabf67 spellchecked gitbook for general-graph and ahuacatl 2014-06-23 13:34:44 +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 7e3bebead7 Sorted export ordering of graph functions in ahuacatl. First deprecated modules are exported, afterwards general graph functions 2014-06-23 13:18:00 +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
Thomas Schmidts c11417cbdb Fixed some some issues with the appearance of the Foxx Chapter 2014-06-23 09:56:08 +02:00
scottashton 62fd91ce3d changed return value of common properties so only the matching attributes are returned 2014-06-23 07:27:20 +02:00
Jan Steemann b5fe73270c use test-helper for unloading collections 2014-06-21 03:19:54 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
scottashton 1cef1a0cd7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:59:58 +02:00
scottashton fb7c608f6c refactored ahuacatl docs 2014-06-20 16:59:51 +02:00
Lucas Dohmen f6b7bb23a0 Remove the stub and mock module 
This is now inside of shell-foxx until it has been converted to
Jasmine
 2014-06-20 16:40:34 +02:00
Lucas Dohmen ca6a9c02ca `backbone` is now `org/arangodb/extend` 2014-06-20 16:40:34 +02:00
Frank Celler 248b3e3329 fixed typo 2014-06-20 15:59:59 +02:00
Heiko Kernbach 5ef874f8f3 merge 2014-06-20 14:58:30 +02:00
Heiko Kernbach ff6877fdc9 added functionality to identify and inform about github information of a foxx 2014-06-20 14:55:22 +02:00
Frank Celler af109c73ca Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-20 14:41:13 +02:00
Lucas Dohmen b8e0d95b69 Removed `apps` as an alias for `controllers` in Foxx manifest files 2014-06-20 14:39:48 +02:00
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +02:00
Frank Celler 2cd0e6d77e Merge pull request #913 from triAGENS/foxx-authentication-options 
Foxx Authentication accepts all options that we support
 2014-06-20 14:27:21 +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
Jan Steemann 3353066f65 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 13:38:10 +02:00
Frank Celler 9c33dec659 verbose comment 2014-06-20 13:34:22 +02:00
scottashton ec2d0e94f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 13:00:01 +02:00
scottashton ec45a40d0b changed examples in routplanner 2014-06-20 12:59:56 +02:00
Lucas Dohmen 03b4a01037 Foxx Authentication accepts all options that we support 2014-06-20 11:12:56 +02:00
Esteban Lombeyda 809d951a50 formating 2014-06-20 10:34:14 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
scottashton 678277981c fixed merge conflict 2014-06-20 09:59:00 +02:00
scottashton b263e38a9e docu refactoring, added more functions into graph module 2014-06-20 09:58:09 +02:00
Jan Steemann 2e734b6a9a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:53:32 +02:00
Jan Steemann 218d23d761 fixed jslint warning 2014-06-20 09:53:01 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Jan Steemann c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 86def51c51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 08:22:04 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Lucas Dohmen 049067dbc4 Merge pull request #874 from triAGENS/foxx-doc-generator-improvements 
Foxx API Documentation explorer doesn't show POST/PUT/PATCH bodies without bodyParam
 2014-06-19 11:53:48 +02:00
Lucas Dohmen 96866a0d9f Some tweaks to the Foxx.Repository documentation 2014-06-19 10:28:36 +02:00
Lucas Dohmen e83d05d3b2 Foxx.Repository#count 2014-06-19 10:28:36 +02:00
Lucas Dohmen ca41f74a63 Foxx.Repository#updateById 2014-06-19 10:28:35 +02:00
Lucas Dohmen 473566a4e2 Foxx.Repository#updateByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 94e2d0e9a4 Foxx.Repository#replaceByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 3bfff286d0 Foxx.Repository#remove 2014-06-19 10:28:35 +02:00
Lucas Dohmen 4b769867be Foxx.Repository#all 2014-06-19 10:28:35 +02:00
Lucas Dohmen b9d4a96652 Add simple documentation for methods without bodyParam 
post, put and patch requests without a bodyParam will now be documented
with an undocumented bodyParam. This will allow people to try out this
undocumented field in the Swagger documentation in the admin interface.
 2014-06-19 10:28:16 +02:00
Jan Steemann bded33eec8 fixed typos 2014-06-18 21:48:29 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Jan Steemann e39737f99e no error but a warning 2014-06-18 21:13:25 +02:00
Jan Steemann 44ad4eea48 added tests for AQL write operations 2014-06-18 20:43:08 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +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
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Alan Plum ba61e07e02 More linting. 2014-06-18 15:21:29 +02:00
Alan Plum c9d7f113a6 Linting. 2014-06-18 15:19:12 +02:00
Frank Celler 900aa7f33b moved gharial from /system to /_api 2014-06-18 14:08:06 +02:00
Alan Plum 40f3e268dd Adjusted injector naming. 2014-06-18 11:09:40 +02:00
Alan Plum 282be72c5c Implemented controller dependency injection. 2014-06-18 01:17:10 +02:00
Lucas Dohmen 5057400e18 Repository#all 2014-06-17 17:34:55 +02:00
Lucas Dohmen df658a0648 A spec for the existing Foxx Repository functionality 2014-06-17 17:34:55 +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
Jan Steemann 091491d13b crash recovery tests 2014-06-17 15:30:11 +02:00
Lucas Dohmen 3c3f4b0b8f Foxx: Reorder and update the tests of Repository 2014-06-17 15:19:19 +02:00
Lucas Dohmen d57f88507b Foxx: Add examples for each of the methods of Repository 2014-06-17 15:19:19 +02:00
scottashton 094809bdf8 more docs 2014-06-17 11:43:21 +02:00
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Jan Steemann b303db2b50 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
 2014-06-17 00:49:18 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Frank Celler 89dbc6d04a Merge pull request #902 from triAGENS/foxx_repository 
[WIP] Foxx.Repository should provide more methods
 2014-06-16 20:16:56 +02:00
Jan Steemann 7f1c67b964 recovery tests 2014-06-16 17:22:20 +02:00
Jan Steemann 02d1cf3ea4 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 17:09:58 +02:00
scottashton ef6ed992f1 fixed typos in docs 2014-06-16 16:58:42 +02:00
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +02:00
scottashton cc3eff2a1e added documentation for ahuacatl 2014-06-16 16:33:40 +02:00
Esteban Lombeyda 19d851c3cb Merge branch 'mjmh' of github.com:triAGENS/ArangoDB into mjmh 2014-06-16 15:24:54 +02:00
Esteban Lombeyda 2405a5ffa2 read-only: unit tests for client and server side 2014-06-16 15:24:12 +02:00
scottashton 252d320795 jslinted code 2014-06-16 15:03:54 +02:00
scottashton b8d2c7f0f6 resolve merge conflict 2014-06-16 14:59:14 +02:00
Jan Steemann 59a5c1fda6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 14:47:47 +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
scottashton 99be3816b3 optimized dijsktra search 2014-06-16 14:44:34 +02:00