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

1457 Commits

Author SHA1 Message Date
Michael Hackstein d4d82e332b The webinterface now also checks if the mountpoint is valid, e.g. does not contain /APP 2015-02-02 14:23:04 +01:00
Michael Hackstein 34458bad92 Added a check to validate the foxx mount point 2015-02-02 13:36:12 +01:00
Jan Steemann 7bcf2b54c0 make explainer display warnings, too 2015-01-29 21:30:42 +01:00
Frank Celler 418a673f2b Merge branch 'devel' of github.com:triAGENS/ArangoDB into request-module 
Conflicts:
	js/node/package.json
 2015-01-29 17:20:15 +01:00
Jan Steemann 93131b6bf7 less copying 2015-01-29 14:21:02 +01:00
Michael Hackstein 54fd833041 Started moving aardvark to new foxx-manager functionality. Confirmed: listing all apps works. 2015-01-28 14:39:08 +01:00
Jan Steemann b03a7a4c8f fun with custom visitors 2015-01-28 00:45:21 +01:00
Michael Hackstein 8e562b2268 Merge branch 'foxx-pathes' of github.com:triAGENS/ArangoDB into foxx-pathes 
Conflicts:
	js/client/modules/org/arangodb/foxx/manager.js
	js/common/modules/org/arangodb/foxx/manager-utils.js
	js/common/modules/org/arangodb/foxx/store.js
	js/server/modules/org/arangodb/foxx/manager.js
 2015-01-26 16:53:34 +01:00
Michael Hackstein c72a967e0d Fixed a bug in foxx manager install local file/directory behaviour. It always loaded file from server not from client when using shell. 2015-01-26 15:34:42 +01:00
Michael Hackstein 6b2b459423 Removed leftovers from rebase 2015-01-26 13:03:06 +01:00
Michael Hackstein 900fce9f4a Installing a foxx app is now possible from App store. 2015-01-26 11:58:16 +01:00
Michael Hackstein c9b92ecf23 Now allows to configure an App during runtime and get its configuration options. Configure will trigger reload routing. 2015-01-26 11:58:16 +01:00
Michael Hackstein 802167cea7 Added triggers for to activate development and production mode of Apps 2015-01-26 11:58:16 +01:00
Michael Hackstein 923bbeb715 Removed foxx store and client foxx manager dependency on common/bootstrap/module 2015-01-26 11:44:31 +01:00
Michael Hackstein e69993323a Created a foxx store module that wraps around the foxx application store. It is now used from the client and server side foxx manager 2015-01-26 11:43:07 +01:00
Michael Hackstein 169042f801 Added a function to get the JSON information for one mount point 2015-01-26 11:36:20 +01:00
Michael Hackstein 465667cea9 The new foxx apps now store themselfes in a collection. One can list all applications and all development applications. 2015-01-26 11:36:20 +01:00
Michael Hackstein 0df4242965 Moved some code from the module into foxx manager 2015-01-26 11:36:20 +01:00
Michael Hackstein 939e12c458 Removed foxx store and client foxx manager dependency on common/bootstrap/module 2015-01-26 11:36:19 +01:00
Michael Hackstein bf9f3fc3a8 Created a foxx store module that wraps around the foxx application store. It is now used from the client and server side foxx manager 2015-01-26 11:36:19 +01:00
Jan Steemann 58ddb95417 reduced number of monkeypatches affecting innocent regular objects 2015-01-24 14:23:53 +01:00
Jan Steemann f5aa621536 reverse index scan 2015-01-23 01:36:46 +01:00
Jan Steemann f9a43224cf added explainer 
Conflicts:
	js/common/modules/org/arangodb/aql/explainer.js
 2015-01-23 00:59:07 +01:00
Jan Steemann 7f20556c78 added query explainer 2015-01-23 00:41:16 +01:00
Michael Hackstein fa72585206 Fixed a bug in the store update function 2015-01-21 14:15:54 +01:00
Michael Hackstein a92f6379f8 Installing a foxx app is now possible from App store. 2015-01-21 13:34:22 +01:00
Michael Hackstein fdaa7c52d2 Now allows to configure an App during runtime and get its configuration options. Configure will trigger reload routing. 2015-01-21 09:54:22 +01:00
Alan Plum d6a46773cd Removed unused deps. 2015-01-20 17:27:56 +01:00
Alan Plum 469d73c8b8 Linting. 2015-01-20 17:27:51 +01:00
Alan Plum 86a39a9f24 Removed body parser helpers. 
Can't use them on the client. Maybe re-implement them later.
 2015-01-20 17:16:36 +01:00
Alan Plum edc17af821 Pass json flag to Response. 2015-01-20 17:16:36 +01:00
Alan Plum 6d5e09a1da request -> exports 2015-01-20 17:16:35 +01:00
Alan Plum bc89aec6f2 Don't throw on HTTP status >= 400. 2015-01-20 17:16:35 +01:00
Alan Plum 70b31626b2 Node request-style default for maxRedirects. 2015-01-20 17:16:35 +01:00
Alan Plum 7b76841496 HTTP methods should be case-insensitive. 2015-01-20 17:16:35 +01:00
Alan Plum bf61d97f73 Headers should be case-insensitive. 2015-01-20 17:16:35 +01:00
Alan Plum d6e0b6e82d Support form as string. 2015-01-20 17:16:35 +01:00
Alan Plum efc2026151 Support parsed url objects. 2015-01-20 17:16:35 +01:00
Alan Plum 28070d1d41 Added consistent url to error request data. 2015-01-20 17:16:34 +01:00
Alan Plum ef3aeea8bc Fixed broken references. 2015-01-20 17:16:34 +01:00
Alan Plum ba25c584b6 Cleanup. 2015-01-20 17:16:34 +01:00
Alan Plum 5183aabca8 Handle JSON like request does. 
This solves the edge case of wanting to pass strings as JSON (i.e. quoted and escaped).
 2015-01-20 17:16:33 +01:00
Alan Plum 12490a53e7 Cleaner error message. 2015-01-20 17:16:33 +01:00
Alan Plum e956cbc0c6 Removed parseForm. Made multipart parsing methods take request object instead of body and headers. 2015-01-20 17:16:33 +01:00
Alan Plum 576f4f4064 Stricter RFC 3986 compliance for querystrings. 2015-01-20 17:16:33 +01:00
Alan Plum 15435982f6 Added content-disposition module. 2015-01-20 17:16:33 +01:00
Alan Plum cb1994130a Added handlers for form/-data/multipart. 2015-01-20 17:16:32 +01:00
Alan Plum 88f852d69d Provide nicer wrapper for internal.download. 2015-01-20 17:16:32 +01:00
Michael Hackstein 39a3fa403d Added triggers for to activate development and production mode of Apps 2015-01-20 16:23:13 +01:00
Michael Hackstein bfc82b2dc0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into foxx-pathes 
Conflicts:
	js/server/modules/org/arangodb/actions.js
 2015-01-20 11:16:44 +01:00
Jan Steemann 63bf4c888a flush WAL status file after collection to shorten recovery 2015-01-18 21:06:57 +01:00
Michael Hackstein 6c8059c8b4 Added a function to get the JSON information for one mount point 2015-01-16 16:16:24 +01:00
Michael Hackstein efc6737743 The new foxx apps now store themselfes in a collection. One can list all applications and all development applications. 2015-01-16 16:16:23 +01:00
Michael Hackstein 720703714b Moved some code from the module into foxx manager 2015-01-16 16:16:23 +01:00
Michael Hackstein d7f17ee1d1 Removed foxx store and client foxx manager dependency on common/bootstrap/module 2015-01-16 16:16:22 +01:00
Michael Hackstein 39edb08e9d Created a foxx store module that wraps around the foxx application store. It is now used from the client and server side foxx manager 2015-01-16 16:16:22 +01:00
Jan Steemann b0fa21b0ce updated conventions documentation for AQL functions 2015-01-16 12:56:02 +01:00
Jan Steemann 36dab4113e stricter checking for AQL user functions 2015-01-16 12:44:59 +01:00
Jan Steemann ef1f56c42c added tests 2015-01-16 12:34:11 +01:00
Willi Goesgens 58e1d0b1fe Expand grace period a little more, maybe valgrind can catch up then. 2015-01-14 09:33:02 +01:00
Michael Hackstein ff30d50c93 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-13 13:20:07 +01:00
Michael Hackstein aaf8d70a83 Improved a generated general graph AQL. It now does not compute the complete set of vertices before filtering, instead it merges the examples before computing. 2015-01-13 13:19:56 +01:00
Alan Plum 2803e090c0 Merge pull request #1188 from triAGENS/windows-line-endings-in-foxx 
Fix Foxx JSDoc for Windows Line Endings
 2015-01-13 13:18:00 +01:00
Willi Goesgens 2e1d52c1f2 Wait longer for collections to unload before failing. 2015-01-13 10:57:11 +01:00
Jan Steemann f9cfbbee4e type-safe comparisons 2015-01-13 01:31:39 +01:00
Frank Celler 06660a6a68 ignore errors in jshintrc 2015-01-04 22:04:45 +01:00
Jan Steemann 363df745ea fix program names 2014-12-17 14:19:54 +01:00
Frank Celler 40e4b40dff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-16 16:28:30 +01:00
Michael Hackstein d8ad93f1b6 Moved fishbowl update from client to common module of foxx manager. Offered update in server-side foxx manager and used it in Web Interface 2014-12-16 14:10:15 +01:00
Michael Hackstein 275503224e Added some Error notification for Foxx App install failures. Added download for Zipfile as well as information for your development path. 2014-12-16 14:10:15 +01:00
Lucas Dohmen e8a474ef60 Fix Foxx JSDoc for Windows Line Endings 2014-12-15 10:00:26 +01:00
Frank Celler 0edff23aa1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-11 12:31:53 +01:00
Jan Steemann 9b15228676 fixed broken documentation 2014-12-11 12:30:41 +01:00
Frank Celler db677ab186 fixed missing makeDirectory when fetching a Foxx application from a ZIP file 
Conflicts:
	CHANGELOG
 2014-12-08 23:18:00 +01:00
scottashton c657790bc4 cleaned up example for getConnectingEdges 2014-12-08 10:58:59 +01:00
Thomas Schmidts e799dfa8f9 Fixed #1007 spelling error fixed 2014-12-05 14:28:08 +01:00
Willi Goesgens 1024750c07 Clarify whether the test is running via arangosh or arangod. 2014-12-01 14:21:00 +01:00
scottashton 401157edd1 jslinted 2014-11-20 09:53:50 +01:00
scottashton 6a418d3a05 added new graph function _connectingEdges 2014-11-19 09:26:40 +01:00
Jan Steemann a71bf1819c issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-17 15:47:39 +01:00
Jan Steemann 64392bfed1 fixed tests 2014-11-17 13:31:02 +01:00
Jan Steemann 675e2a0d40 fixed WITHIN_RECTANGLE for cluster 2014-11-17 12:32:43 +01:00
Jan Steemann 67356de499 issue #1098: some tests for error checking 2014-11-14 17:14:33 +01:00
Jan Steemann 2c0f5b96c9 issue #1098: added better error checking 2014-11-14 16:56:25 +01:00
Willi Goesgens 09d2b4ee55 Add new perf tests. 2014-11-04 14:11:03 +01:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Willi Goesgens 501c721e72 Add jmeter JTL output format to perftests 2014-10-30 14:16:08 +01:00
Willi Goesgens 97459a1aa6 Reset test stati when results are fetched. 2014-10-30 10:23:21 +01:00
Jan Steemann 4418e58315 removed old-style Doxygen sections 2014-10-30 01:16:07 +01:00
Jan Steemann cf6fcb2fc1 linted python files, regenerated derived files 2014-10-29 23:56:20 +01:00
Jan Steemann 1865b8bd57 jslint 2014-10-29 22:42:52 +01:00
Willi Goesgens 8db1e18568 Adjust the result returned to be the old format again. 2014-10-29 21:10:57 +01:00
Willi Goesgens 3e9d91341f When running several suites in one file, we have to remember the results. 2014-10-29 14:44:21 +01:00
Jan Steemann e581aa6612 fixed usage of AQL user-defined functions from web UI 2014-10-27 11:09:20 +01:00
Thomas Schmidts d79ff5d74d Fixed broken links 2014-10-24 17:49:01 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann 3b52200983 fixed inner loop variable fuckup 2014-10-09 17:28:01 +02:00
Jan Steemann c5c7957b5e manually merged pr #1029 by @baslr 2014-09-29 13:52:32 +02:00
Willi Goesgens ca1ccbab79 Try to match the jenkins grinder input tools csv grammer 2014-09-26 10:37:39 +02:00
Willi Goesgens cba6e480fe Don't add trailing \n to the CSV 2014-09-25 17:31:32 +02:00
Willi Goesgens 6e00b45b50 Add a missing column to the CSV. 2014-09-25 14:49:48 +02:00
Willi Goesgens 1663a18dee Rename the grinder csv log 2014-09-24 18:37:25 +02:00
Willi Goesgens 9e94af7fb1 Perf suite: Add grindertool alike CSV-Exporter 2014-09-24 17:42:54 +02:00
Willi Goesgens 47c4817c50 Adjust perf tests reply structure & the report generator to the new standard. 2014-09-24 13:35:44 +02:00
Willi Goesgens 5b4209d95e Rearange the outputs of our tests so it matches the structure required by the unittest framework 2014-09-24 11:41:51 +02:00
Willi Goesgens 357764ac57 Implement structures in the same way for all other tests, and move the pretty printer over, so users calling testing.js directly can also enjoy human readable test results. 2014-09-23 16:56:24 +02:00
Willi Goesgens ca23f467ed Evaluate the correct return code here too. 2014-09-23 13:21:41 +02:00
Willi Goesgens 6a2a025313 Our test results are relevant. 2014-09-23 11:52:19 +02:00
Willi Goesgens 9e53626f5b Add status to perftests, so the unittestrunner is lucky with our result and we don't fail in jenkins. 2014-09-23 11:17:22 +02:00
Willi Goesgens 968023aa46 Measure the time used per test. 2014-09-23 10:44:08 +02:00
Willi Goesgens 42647b01f7 Fix aggregation of overal test result state 2014-09-23 10:18:49 +02:00
Willi Goesgens 03ca3431e1 Add more information to the unittest status xml 2014-09-22 17:10:06 +02:00
Willi Goesgens 772a99faec try another place to add our performance results in the xml. 2014-09-22 15:54:02 +02:00
Willi Goesgens fc5a14311c Add output formatter to intergrate with https://wiki.jenkins-ci.org/display/JENKINS/PerfPublisher+Plugin 2014-09-22 14:23:24 +02:00
Willi Goesgens d6fbebf723 Add the output of the aql execution bits in the results table so we can easily see which parts take how long. 2014-09-22 13:06:53 +02:00
Willi Goesgens 45cc45f827 Add profile information to the output of the new tests. 2014-09-19 17:53:00 +02:00
Willi Goesgens aaaf2b621f Start implementing performance test tools comparing new & old query engine 2014-09-18 18:19:05 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann 4e6f6f2cbd finalized move to cxx 2014-09-14 00:06:00 +02:00
Jan Steemann c034307dca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Utils/CollectionNameResolver.h
 2014-09-10 15:54:49 +02:00
Michael Hackstein 9b62c7367b Deprecated _directedRelation and _undirectedRelation in general-graphs. Created _relation in general-graphs creating a _directedRelation. Handling undirected relations is now given to the user / api-implementor as arangodb itself does not offer any direction constrains which caused some confusion 2014-09-10 15:50:22 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
 2014-09-09 22:18:52 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Jan Steemann cf4deda835 fixed jsunity 2014-09-08 11:44:20 +02:00
Alan Plum 469af580e5 Added PBKDF2-HMAC. 2014-09-05 16:23:37 +02:00
Willi Goesgens 4b41b449f5 JSUnity: add stacktraces to failing assertions; this way you can get the line in your test better. 2014-09-05 11:49:05 +02:00
Frank Celler 4ffec6e914 tried to silence rpmlint: remove empty files, remove unused scripts, fixed initgroups, fixed identical files, remove __DATE__ 
Conflicts:
	CHANGELOG
	Makefile.in
 2014-09-05 09:28:21 +02:00
Alan Plum 4e3659c01a Added support for sha384, sha512. 2014-09-04 23:17:58 +02:00
Alan Plum 39ba358cd8 Added JWT support for session headers. 2014-09-04 18:51:06 +02:00
Alan Plum 37888a98ea Pass on null queries. 2014-09-03 11:39:02 +02:00
Alan Plum 33db483e7f Support AQB instances as query strings. 2014-09-03 11:36:55 +02:00
Alan Plum b384563d97 Linting: tutorial, changes. 2014-09-02 22:21:45 +02:00
Alan Plum e86c98dfe2 Enabled unused: true, ported aardvark jslint to jshint. 2014-09-02 22:18:18 +02:00
Alan Plum 7b24bdba8d Enabled strict: true. 2014-09-02 22:16:07 +02:00
Alan Plum 606da1e3e8 Removed jslint headers from server/client/common modules. 2014-09-02 22:14:56 +02:00
Alan Plum 6a3386e55a Fixed jshint headers. 2014-09-02 22:12:45 +02:00
Alan Plum b665e038be Switched jslint to jshint. Broke everything. 2014-09-02 22:10:24 +02:00
Jan Steemann cda10393f5 some traversal speedups 2014-08-27 18:56:51 +02:00
Alan Plum 601c99c6e5 Linting. 2014-08-25 20:01:18 +02:00
Alan Plum 898fad4980 Added support for JWT alg: 'none'. 2014-08-25 18:35:23 +02:00
Alan Plum d37b13ee0f Implemented crypto.jwtEncode/jwtDecode (HS256 only). 2014-08-25 18:25:48 +02:00
Jan Steemann 2a2c76770c need to ALWAYS create a new environment. Otherwise results are somewhat non-deterministic 2014-08-15 17:35:46 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann 0e8949f8b3 unify function behavior in shell and server 2014-08-05 09:07:28 +02:00
Michael Hackstein 83d49c0d9d Fixed a minor bug where it was not allowed to remove a vertex from a graph by its key 2014-07-30 09:41:57 +02:00
Frank Celler 026121dadd fixed sandbox 2014-07-24 16:06:06 +02:00
Frank Celler 55e1ee43bd added createLocations 2014-07-24 16:06:06 +02:00
gschwab 0df37812e2 initial check in 2014-07-23 13:39:16 +02:00
Jan Steemann e7c18b40a6 fixed statistics interval 2014-07-23 11:39:15 +02:00
Max Neunhoeffer a8e3236560 Snapshot, legend cache started. 2014-07-22 16:59:19 +02:00
Michael Hackstein 3ecae27acd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 16:57:33 +01:00
Michael Hackstein db33dd22d2 Fixed a minor bug in gharial where there was no correct error code was thrown when trying to store a vertex in a non existing graph. Also allowed the _create method of graph module to take options like waitForSync 2014-07-15 16:57:24 +01:00
Thomas Schmidts f4e60b7315 Fixed too long line 2014-07-11 09:29:31 +02:00
Thomas Schmidts de75804367 Chapters are color-coded in the documentation. Also bug fixed for Safari 2014-07-10 16:33:47 +02:00
Michael Hackstein 608dd475f6 Fixed an error in a general graph example 2014-07-10 13:38:16 +02:00
Michael Hackstein 8cf3a41a0c Used documentation generation commands in general graph documentation 2014-07-09 09:58:04 +02:00
Michael Hackstein b0722d9981 FIxed a bug in an example 2014-07-08 17:36:16 +02:00
Michael Hackstein c3a9335621 General graph module now allows to drop the collection alongside the definition of a graph 2014-07-08 17:30:14 +02:00
Michael Hackstein 1f795fec66 Improved gharial and general graph documentation. Gharial now documents waitForSync, keepNull and if-match 2014-07-08 17:18:15 +02:00
Michael Hackstein c9b14f9413 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 16:02:06 +02:00
Michael Hackstein 47d092cc3c Removed commented debug output 2014-07-08 16:02:01 +02:00
Thomas Schmidts c9ece0af5c @startDocuBlock removed from non used code block 2014-07-08 15:40:30 +02:00
Michael Hackstein bbda062747 Fixed a minor bug when updating the edge definitions. The currently referenced graph object was not updated properly, the stored one was. 2014-07-08 15:23:59 +02:00
Michael Hackstein f763f0aa13 Added an error for the graph module. It will be thrown on the attempt to add an orphan collection that is already used. Also alloed orphan collections for restrictions in fluentAQL 2014-07-08 13:53:39 +02:00
Michael Hackstein 9c452b826c Fixed a bug where collections where dropped although they were used as orphans in other graphs 2014-07-08 09:50:30 +02:00
Thomas Schmidts 19e750b35f Fixed some small errors in @startDocuBlock 2014-07-07 16:58:26 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
scottashton 866604f93d jslinted 2014-07-07 14:47:14 +02:00
scottashton 64a72ed12b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-07 14:22:41 +02:00
scottashton c5bfe5a33c changed gharial to match php api 2014-07-07 14:21:58 +02:00
Jan Steemann c12df38eb2 fixed broken examples 2014-07-06 02:25:19 +02:00
Jan Steemann 158cdd1c7a improved printing of cursors 2014-07-06 00:44:37 +02:00
Jan Steemann 27c106e1f2 removed debug output 2014-07-03 18:51:50 +02:00
Jan Steemann 7554ead5d4 fixed recovery 2014-07-03 16:58:10 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0d6ecea63f removed debug output 2014-07-01 15:58:51 +02:00
gschwab 76d6188a34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 14:37:39 +02:00
Thomas Schmidts 6a12940da0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 14:07:29 +02:00
gschwab 9bd7d0bb87 fixed orphan prob 2014-06-30 13:39:02 +02:00
Jan Steemann 6d5da6d834 fixed test 2014-06-30 13:28:26 +02:00
Thomas Schmidts 7d0ab74085 Fixes make examples error 2014-06-30 11:47:42 +02:00
Thomas Schmidts 52ad8fc702 Some changes in the documentation code for gitbook 2014-06-30 09:29:02 +02:00
Thomas Schmidts 148f400991 Changed some (sub)chapters and fixed spelling errors 2014-06-27 11:02:10 +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
Thomas Schmidts 3eae1a4751 Exchanged verbinclude with Arangosh for bett examples in gitbook 2014-06-26 13:41:17 +02:00
Thomas Schmidts d01417c6ed changed simple-query-common.js to read out the comments for the dcoumentation 2014-06-25 17:39:46 +02:00
Thomas Schmidts 45f27782e0 More changes in the documentation code 2014-06-25 17:27:12 +02:00
gschwab 165daa0c1e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-25 16:33:32 +02:00
gschwab 51389fcfd6 fixed graph managment 2014-06-25 16:32:23 +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 9d26904ffc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 15:18:13 +02:00
Thomas Schmidts f005d676cb Some changes in the code documentation 2014-06-25 15:10:13 +02:00
gschwab d7520ce53c jslint 2014-06-25 15:02:47 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
gschwab 71621b9d4e fixed tests 2014-06-25 14:47:03 +02:00
gschwab 834a4a5c7c docu feedback integrated 2014-06-25 11:20:24 +02:00
gschwab 58c75a582a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 09:14:55 +02:00
gschwab 466d13ddd2 new graph management 2014-06-25 09:14:45 +02:00
Lucas Dohmen 9b37812da6 Review of General Graph 2014-06-24 23:44:49 +08:00
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +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 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
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
gschwab 5f5d6171cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 11:54:48 +02:00
gschwab e049f85b44 docu 2014-06-24 11:54:42 +02:00
Jan Steemann 31e6823daa fixed invalid regex 2014-06-24 11:24:10 +02:00
gschwab f9f73c4e51 docu 2014-06-24 10:44:06 +02:00
gschwab 62dd01fe00 docu 2014-06-24 10:41:23 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Thomas Schmidts 859ad4fbb0 Changes in the code documentation 2014-06-23 16:18:58 +02:00
Michael Hackstein cff6bd9380 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 15:15:18 +02:00
Michael Hackstein 57a77b4420 Changed all examples so they use graph_module and graph as variable names 2014-06-23 15:14:39 +02:00
scottashton 4e717d5430 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:11:54 +02:00
scottashton e2fc348467 fixed broken links and typos in general-graph 2014-06-23 15:11:36 +02:00
gschwab b69b016f87 layout 2014-06-23 14:44:07 +02:00
gschwab 898311c23b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:44:24 +02:00
gschwab 0b09442ad9 typos 2014-06-23 13:44:04 +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
gschwab 35b645ba1a deleted print O.o 2014-06-23 13:23:09 +02:00
gschwab 19191b5a1b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:20:18 +02:00
gschwab 4651fbd34a deleted print 2014-06-23 13:20:12 +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 273eaf95fb Added graph specific deprecation information to DEPRECATED.md 2014-06-23 13:17:20 +02:00
gschwab 8b347c6714 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:02:00 +02:00
gschwab cda1eb462c sorting for edgeDefinitions added 2014-06-23 13:01:55 +02:00
scottashton b35b19a231 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 11:37:57 +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
Michael Hackstein d0213dc516 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 11:01:07 +02:00
Michael Hackstein b37881c4de Fixed minor mistakes in general graph module documentation 2014-06-23 11:01:04 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
Michael Hackstein 7bf98a463b Documentation fixes in general graph module. Fixed Example to drop a graph (drops collections in background now) 2014-06-23 09:50:19 +02:00
gschwab 69df68c54e renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:47:48 +02:00
gschwab d31e8f784b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 09:13:51 +02:00
gschwab 1f02d36570 renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:11:07 +02:00
Michael Hackstein b468d336c8 Fixed an error for list of graphs in the graph module 2014-06-20 17:45:37 +02:00
Michael Hackstein 76049a456a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 17:25:14 +02:00
Michael Hackstein 59010f7a68 Finished with the first run through the general graph modules documentation to add improvements 2014-06-20 17:25:05 +02:00
Michael Hackstein 7bff2d7ff7 And some more optimizations of the general graph module documentation 2014-06-20 16:57:33 +02:00
Lucas Dohmen 192a35eeca testrunner jslinted 2014-06-20 16:40:34 +02:00
Lucas Dohmen b88be851e8 JSLinted org/arangodb/extend 2014-06-20 16:40:34 +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
Lucas Dohmen ec43e21fb7 Move `util` to node, because it is only used there 2014-06-20 16:40:33 +02:00
Michael Hackstein 426961abef Further improvements of general-graph documentation. 2014-06-20 16:21:17 +02:00
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
Michael Hackstein c0cbe73476 Futher layout optimization of FluentAQL Graph Module 2014-06-20 16:01:25 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Michael Hackstein 707c79d5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 15:07:29 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +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
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +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
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
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 e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +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 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Frank Celler 5ea6286029 removed leading blanks 2014-06-18 19:14:34 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Michael Hackstein ff709e92b6 Fixed examples for graph http module 2014-06-18 16:50:14 +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
gschwab 10ff1d391c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 15:22:55 +02:00
gschwab cb649c1293 fixed collection binding 2014-06-18 15:22:49 +02:00
Alan Plum c9d7f113a6 Linting. 2014-06-18 15:19:12 +02:00
Michael Hackstein f9b16f5e23 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 14:49:04 +02:00
Michael Hackstein 1d503a0d2a Added the knows graph of the traversal module to graph examples. Started rewriting traversal examples for new graph module. 2014-06-18 14:44:40 +02:00
gschwab 6ff46bb068 docu fixed 2014-06-18 11:12:10 +02:00
gschwab 528b1e85cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 10:56:22 +02:00
gschwab dcd9cd669f graph._removeVertexCollection(...): dropCollection default set to false - docu 2014-06-18 10:56:18 +02:00
Michael Hackstein 25293a4d20 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 10:51:06 +02:00
gschwab 6dc18982aa graph._removeVertexCollection(...): dropCollection default set to false 2014-06-18 10:50:07 +02:00
gschwab 820d318927 graph._drop(): dropCollection default set to false 2014-06-18 09:52:49 +02:00
gschwab 7366e8a6d9 renamed removeOrphanCollection(..) -> removeVertexCollection(..) 2014-06-18 09:29:34 +02:00
gschwab 903dce0fbf renamed getOrphanCollections() -> orphanCollections() 2014-06-18 09:01:04 +02:00
Michael Hackstein 11b48ceca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 08:53:29 +02:00
Alan Plum 130e7fa53b Added crypto.constantEquals. 2014-06-18 01:15:39 +02:00
Lucas Dohmen 360d9c82a1 Merge pull request #910 from triAGENS/foxx_repository 
Rewrote the Foxx Repository Specs with Jasmine
 2014-06-17 21:48:09 +02:00
Michael Hackstein 2136673e94 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 18:22:31 +02:00
gschwab 4f962ed379 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 18:18:28 +02:00
Lucas Dohmen 79f2c7f72c Jasmine Fixes 2014-06-17 17:34:54 +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
Michael Hackstein 9a948ed92b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 13:34:42 +02:00
Alan Plum de9750cf21 Fixed hmac comments. 2014-06-17 13:25:07 +02:00
gschwab 9b68074a40 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 13:22:38 +02:00
gschwab 889bf312a1 docu 2014-06-17 13:22:32 +02:00
Michael Hackstein 17b088fcc8 Fixed example generation for new graph module 2014-06-17 13:22:31 +02:00
Michael Hackstein 18df651dff Fixed some graph module examples 2014-06-17 13:14:05 +02:00
scottashton d5bffb80c6 resolve merge conflict 2014-06-17 11:50:29 +02:00
scottashton 094809bdf8 more docs 2014-06-17 11:43:21 +02:00
gschwab 9176391eb6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 11:23:37 +02:00
Michael Hackstein 9fe3d9d2f2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 11:23:16 +02:00
gschwab cb18e9e8b3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 11:22:03 +02:00
Michael Hackstein 5f43e43979 Added more in-code documentation for the graph module 2014-06-17 11:21:22 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
gschwab 579b55e8f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 10:57:45 +02:00
gschwab 37b532d872 fixed docu examples 2014-06-17 10:57:37 +02:00
Michael Hackstein 59d8ebe830 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 09:53:15 +02:00
Michael Hackstein 37c006c8dc Added documentation for _create function in graph module code 2014-06-17 09:53:11 +02:00
gschwab 6afda915ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 09:42:46 +02:00
gschwab 1afee1b2eb fixed docu 2014-06-17 09:42:34 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Lucas Dohmen dbfbd994cb Merge pull request #905 from triAGENS/jasmine 
[WIP] Add Support for Jasmine in our ArangoDB JavaScript Tests
 2014-06-16 16:32:55 +02:00
gschwab 6fe06843fe manually merged docu into mdpp 2014-06-16 16:22:49 +02:00
Lucas Dohmen 5abece1642 Make the output format configurable from the outside 2014-06-16 15:59:49 +02:00
Lucas Dohmen 8e22d4ef42 Refactoring Jasmine Wrapper 2014-06-16 15:55:45 +02:00
Lucas Dohmen 912b2cfd93 Jasmine: Execute in sandbox 2014-06-16 15:13:23 +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
Lucas Dohmen 403cdd80b6 Refactor Test Runner 2014-06-16 14:39:40 +02:00
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +02:00
Lucas Dohmen f939c8de08 Removed the unused Coverage functionality 2014-06-16 14:39:40 +02:00
Lucas Dohmen db5470ae6c Execute Jasmine specs via arangod --javascript.unit-test 2014-06-16 14:39:40 +02:00
Lucas Dohmen b0ce561546 Implemented `pending` 2014-06-16 14:39:40 +02:00
Lucas Dohmen 61fb82bb45 Refactoring of Jasmine functionality 2014-06-16 14:39:40 +02:00
Lucas Dohmen 4b1097a110 Status Code 2014-06-16 14:39:39 +02:00
Lucas Dohmen bf34e5f870 Reporter can now also have a dot format 2014-06-16 14:39:39 +02:00
Lucas Dohmen 7ca09cbf85 Really fancy reporter 2014-06-16 14:39:39 +02:00
Lucas Dohmen eade04cb17 Cleaned up and prettified the reporter 2014-06-16 14:39:39 +02:00
Lucas Dohmen 8c8fd7b72b First steps towards integrating Jasmine 2014-06-16 14:39:39 +02:00
gschwab 2514183982 jslint 2014-06-16 14:30:42 +02:00
gschwab 229834f5a4 fixed merge conflicts 2014-06-16 14:27:47 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Michael Hackstein dc3e3703cc Solved uniqueness conflicts for generated examples 2014-06-15 23:12:26 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
gschwab 0646677b3e orphan collections treatment added with edit edge definitions 2014-06-13 11:51:15 +02:00
Jan Steemann 9e03189fb0 added waitUnload as a test helper function 2014-06-13 11:31:14 +02:00
Jan Steemann 9e19e0c6ca don't print errors if something goes wrong 2014-06-13 02:23:13 +02:00
gschwab 1ed179cbaa some docu for orphan collections 2014-06-12 16:57:31 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab 3900902821 tmp repaired empty block for commit 2014-06-12 11:42:27 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
scottashton f4b67ed01d jslinted 2014-06-11 16:04:15 +02:00
gschwab 63272b8a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:51:41 +02:00
gschwab de08c073ab jslint 2014-06-11 15:50:30 +02:00
scottashton 5bb6a22e82 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:45:46 +02:00
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +02:00
gschwab 3556868659 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 14:52:10 +02:00
gschwab 4bc2905f29 added extend and edit functions for edgeDefinitions of existing graphs 2014-06-11 14:51:26 +02:00
Michael Hackstein f9628e48c2 Fixed tests for new error codes. Also implemented creation of an empty graph initially. It can be modified during runtime 2014-06-11 10:52:07 +02:00
Michael Hackstein aa659e4686 Fixed JSLint warning 2014-06-11 10:23:03 +02:00
Michael Hackstein e2ab756642 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-11 09:59:41 +02:00
Michael Hackstein d2159e8897 Added some error objects for general graph module 2014-06-11 09:59:23 +02:00
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +02:00
gschwab 866709a434 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-10 13:30:13 +02:00
gschwab 4bcca3408a - added function to remove a single edge definition from a graph\n- some docu 2014-06-10 13:30:07 +02:00
Frank Celler 4354d3e77c added example-users 2014-06-10 13:16:05 +02:00
Michael Hackstein af735550fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 16:32:35 +02:00
Michael Hackstein e13164e247 Fixed duplicated names for examples 2014-06-06 16:32:32 +02:00
gschwab dda28bc102 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-06 15:41:50 +02:00
gschwab ee46c3bdaa fixed jslint 2014-06-06 15:41:46 +02:00
gschwab 682d85a948 renaming of getIn/OutVertex to getFrom/ToVertex, documentation 2014-06-06 15:40:51 +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
Michael Hackstein 87b4124dfc Updated fluent AQL query interface documentation 2014-06-05 17:36:12 +02:00
scottashton e6b4fff2f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-05 16:59:53 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Michael Hackstein 9e4a983d2f Simplified some general graph tests 2014-06-05 11:45:20 +02:00
Michael Hackstein bcbcf635e4 Further improvements in FluentAQL docu. It is now at least readable 2014-06-04 19:03:19 +02:00
Michael Hackstein 6da48f6ae8 Removed _.neighbors from general graph module. The way to get neighbors is to first select the set of start vertices and then execute neighbors 2014-06-04 17:17:20 +02:00
Michael Hackstein d1ef96a801 Added further docu to general graph and removed unused functions 2014-06-04 14:32:47 +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 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
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
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +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 062c6649e2 remove is transactional now 2014-06-02 16:57:20 +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
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
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
Michael Hackstein 5228984679 Fixed graph tests 2014-05-28 21:48:22 +02:00
gschwab 1fc4060899 edgeCollection may only be used in equal edge definitions 2014-05-28 15:45:03 +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
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +02:00
Esteban Lombeyda 5cc5d16645 Bug fix: yielding correct format for option parameters 2014-05-26 15:39:47 +02:00
Jan Steemann 1351de4523 fixed invalid collection / document access 2014-05-26 15:17:36 +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
gschwab d01fa951c2 some error handling added 2014-05-26 11:41:35 +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 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 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
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
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
scottashton f7a78f354d added tests for GRAPH_VERTICES 2014-05-23 15:08:35 +02:00
scottashton 51cc041052 added GRAPH_VERTICES 2014-05-23 14:29:53 +02:00
Michael Hackstein b59033cc94 Improved the restrict statement, it is now not so restricted any more. Now .edges().filter().restrict() is allowed 2014-05-23 14:05:01 +02:00
Michael Hackstein fef7fd355e Finished tests against AQL for current state of fluent interface in general graph module. 2014-05-23 12:51:28 +02:00
Michael Hackstein 0a4877b71a Changed interface of graph._edges(). It now expectes examples for edges instead of examples for connected verticies. This fits better for chaining either start with a couple verticies or a couple of edges 2014-05-23 11:46:41 +02:00
Michael Hackstein 742e05d06b Further implementation of tests against generated AQL in general-graph module 2014-05-23 11:25:48 +02:00
Michael Hackstein 7a55d89363 Started implementing checks against chained AQL statements in general-graph. 2014-05-23 10:48:49 +02:00
Michael Hackstein 6f6091a846 Fixed most tests of the simple suites in general_graph. The restrict test fails right now, some error in AQL 2014-05-23 10:16:19 +02:00
Michael Hackstein 2296f15bef Made the general-graph code a bit more DRY 2014-05-23 00:06:38 +02:00
scottashton 25d6bf15f1 cleaned up merge conflict 2014-05-22 17:54:13 +02:00
scottashton 3bec9b4c93 refactored aql 2014-05-22 17:49:20 +02:00
Thomas Schmidts e5d4642193 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 15:48:28 +02:00
Thomas Schmidts 33b8a3b05c issue #849: A few changes 2014-05-22 15:47:44 +02:00
Michael Hackstein fe62bc8609 Added tests for chains in fluent aql interface for general graphs 2014-05-22 15:21:08 +02:00
gschwab 4bb40d8de5 removing a vertex will remove all edges where this vertex is used in all graphs 2014-05-22 15:14:45 +02:00
Michael Hackstein 790046b177 Started implementing more elaborate tests for chaining. Initial vertex tests are implemented but will intentionally fail now, corresponding AQL implementation is yet missing 2014-05-22 14:03:58 +02:00
gschwab c63c8c465e jslint fix 2014-05-22 12:34:08 +02:00
gschwab 0d25c94b62 graph._drop does not anymore drop collections used in other graphs 2014-05-22 10:41:38 +02:00
scottashton 0353483339 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 09:17:54 +02:00
scottashton 247fea8cef neighbors 2014-05-22 09:17:43 +02:00
gschwab 56f0576f99 implemented _extendEdgeDefinitions() 2014-05-22 09:05:47 +02:00
gschwab c0a7aa2d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 08:32:37 +02:00
gschwab 3947574805 renamed edgeDefinitions -> _edgeDefinitions 2014-05-22 08:32:34 +02:00
Michael Hackstein 75d5a04ae7 Embedded cursors into fluent AQL interface for graphs. 2014-05-21 18:22:30 +02:00
Michael Hackstein 852c4da742 Added an example for Example generation in code to general graph module 2014-05-21 17:34:03 +02:00
Michael Hackstein 27474a7960 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-21 09:55:37 +02:00
Michael Hackstein ed14083e6f Implemented a wrapper around collections in graph module. Old collection functionality is now preserved 2014-05-21 09:45:53 +02:00
gschwab acb43a202f fixed remove for vertexColelctions 2014-05-20 16:51:54 +02:00
Michael Hackstein d03a8fa11b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 16:22:47 +02:00
Michael Hackstein dddc5cbd9e Added an _exists function to the general-graph module, which checks if there is a graph with given name to avoid error throwing within apps 2014-05-20 16:22:44 +02:00
gschwab 0cc4969a31 jslint 2014-05-20 15:53:20 +02:00
gschwab de2fd3ff69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:35:13 +02:00
gschwab 072b00c54b edges of a vertex will be removed, when vertex is removed 2014-05-20 15:35:09 +02:00
Michael Hackstein bb9aaaeb4e Fixed error handling on restrict. It will now throw an error if query is restricted to an unkown collection 2014-05-20 14:43:42 +02:00
gschwab ef1665391a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 12:56:41 +02:00
gschwab ad10fc85e6 added drop function for graphs 2014-05-20 12:56:33 +02:00
Jan Steemann 9513227449 test fuxx 2014-05-20 12:44:51 +02:00
Michael Hackstein d89ff71dbc Implemented generalGraph as a datasource for Traversal queries incl. tests 2014-05-20 11:39:33 +02:00
gschwab 3c0fdae6f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 08:57:48 +02:00
gschwab bfb5610426 x-edges tests 2014-05-20 08:57:44 +02:00
Michael Hackstein ff54178f22 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 17:47:47 +02:00
Michael Hackstein b798c4f23a Enabled tests against AQL execution in graph module 2014-05-19 17:47:42 +02:00
Jan Steemann b06e89da54 simplified 2014-05-19 17:44:56 +02:00
Michael Hackstein af96bf0b70 Fixed jslint warning, missing semicolon 2014-05-19 16:19:22 +02:00
Michael Hackstein 6a33a9f9e3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 16:17:34 +02:00
Michael Hackstein 39b38ae159 Commented part of the fluent AQL interface in graphs, there is some conception necessary. Implemented a filter alternative instead 2014-05-19 16:17:30 +02:00
gschwab 81c4982380 added tests for vertex and edges - fixed jslint 2014-05-19 15:15:58 +02:00
gschwab 37f7002c75 added tests for vertex and edges - fixed jslint 2014-05-19 15:06:15 +02:00
gschwab c38a455760 added tests for vertex and edges 2014-05-19 15:04:19 +02:00
Michael Hackstein 105dde54a7 Implemented filter on general graph module and simplified test code 2014-05-19 13:12:10 +02:00
Michael Hackstein 044f094139 Fixed a bug in graph module aql generation. For in was missing 2014-05-19 12:02:21 +02:00
Michael Hackstein 8bf9922693 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 11:46:25 +02:00
Michael Hackstein deb477b453 Implemented restrict on edges/inEdges/outEdges in general graph module 2014-05-19 11:46:19 +02:00
Michael Hackstein 5255e8f26b Added tests for restriction on edges call in general graph module 2014-05-19 11:08:23 +02:00
Michael Hackstein d558fa8fbd Started implementing fluent AQL interface. Right now allows edges 2014-05-19 10:55:16 +02:00
scottashton d9951b9642 finished tests for _create and _graph 2014-05-19 09:47:37 +02:00
scottashton 58eefee6b5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 09:45:49 +02:00
scottashton 0c0c2773fa finished tests for _create and _graph 2014-05-19 09:45:43 +02:00
Michael Hackstein 4ac62a5461 Fixed JSLint and renamed graph functions to start with _ 2014-05-19 09:30:44 +02:00
scottashton 1ac649cf94 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 08:43:01 +02:00
scottashton 4dbbc550df work in progress 2014-05-19 08:42:37 +02:00
Michael Hackstein 0a73cd6823 Implemented restrict interface on edges, right now implementation is not optimized, missing cursor functionality 2014-05-17 11:27:47 +02:00
Michael Hackstein 20d33b80a5 Bound collections by name to graph object. graph.v === db.v 2014-05-16 17:22:32 +02:00
Michael Hackstein f490018530 Renamed internal functionality to '_' and internal variables with equal names to '__' 2014-05-16 16:50:11 +02:00
Michael Hackstein fd939bdca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 16:28:03 +02:00
Michael Hackstein 1e9e5d3254 Fixed a bug where only collections with the name 'relationName' could be created 2014-05-16 16:26:45 +02:00
scottashton 1a0b0e4a49 pre merge commit 2014-05-16 16:16:48 +02:00
gschwab 55c494c81d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 16:12:40 +02:00
gschwab 1960ce34f4 added vertex and edge methods 2014-05-16 16:10:22 +02:00
Michael Hackstein e404d070f4 Fixed merge conflict on general graph tests 2014-05-16 15:31:39 +02:00
scottashton 47dfdcd75c first version of create graph 2014-05-16 15:19:16 +02:00
scottashton 11faa956a7 first version of create graph 2014-05-16 15:17:54 +02:00
gschwab f0194b5b25 fixed jslint 2014-05-16 14:52:09 +02:00
Jan Steemann 7b44fd92f9 fixed db.collection.geo documentation 2014-05-16 14:46:13 +02:00
gschwab 6451af1cb4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 13:10:31 +02:00
gschwab 24871b64ef start implement edges() 2014-05-16 13:08:33 +02:00
scottashton fd944eee8e fixed jslint 2014-05-16 13:02:56 +02:00
scottashton 266f72a253 initial checkin for new graph module 2014-05-16 11:29:22 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann ee8fe74a8a removed tabs 2014-05-14 17:41:00 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Jan Steemann cfc2d407d7 added tests for task management 2014-05-10 00:43:14 +02:00
Jan Steemann 7ee2caf94e simplified usage of arango-statement 2014-03-28 16:57:59 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Frank Celler e3df90d2c3 coffee script fix 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-03-20 19:36:42 +01:00
Frank Celler ce9c992edc removed test files 2014-03-07 12:10:19 +01:00
scottashton 6fb391eb3f jslint hints fixed 2014-03-04 13:32:39 +01:00
Frank Celler 5c816ec808 added clusterId in statistics 2014-03-04 10:30:17 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Frank Celler 3c992b0bbe removed old files 2014-02-27 13:16:54 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangosh/V8Client/arangosh.cpp
 2014-02-26 21:34:34 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Jan Steemann 8fe19fa897 fixed index tests 2014-02-25 11:55:39 +01:00
Jan Steemann 7f236650ff fix database name in prompt 2014-02-24 14:46:58 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Jan Steemann 35c00ce592 jslint ist unser freund 2014-02-21 09:07:22 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler 38f1e55f99 ignore cache 2014-02-20 20:35:18 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 29c09e1ef7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 10:04:43 +01:00
Jan Steemann a0c3a7fe56 improved users API 2014-02-20 10:04:13 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
Jan Steemann 10b406b0e9 flush the user authentication cache after any modifications 2014-02-12 09:12:48 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
 2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
 2014-02-09 18:39:11 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
 2014-01-31 11:31:09 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Jan Steemann a5d4b1b5a1 make change for issue #755 less strict 2014-01-31 02:07:27 +01:00
Jan Steemann ea7772295b issue #755 2014-01-31 02:02:25 +01:00
Jan Steemann b7ad436d19 issue #755: TRAVERSAL does not use strategy, order and itemOrder options 2014-01-31 01:52:07 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Jan Steemann 0a2d61a42a added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc. 2014-01-28 01:51:27 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-01-21 09:29:45 +01:00
Jan Steemann 4f5052f469 issue #730: initial implementation of A* 2014-01-18 01:46:24 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Jan Steemann 03b55488b6 fixed client-side implementation of function registration 2014-01-03 13:58:35 +01:00
Jan Steemann 3023521535 fixed client-side implementation of function registration 2014-01-03 13:58:01 +01:00
Jan Steemann 91c52a3a2e fixed potential deadlock in global context execution 2014-01-03 13:47:11 +01:00
Jan Steemann ef84ba6705 fixed potential deadlock in global context execution 2014-01-03 13:45:43 +01:00
Michael Hackstein 920f5e6d4b Updated JSUnity, now equalitycheck for objects does not care for ordering anymore 2014-01-02 18:05:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann 28110b01e3 issue #671: make more graph-methods work client-side, too 2013-11-25 10:23:46 +01:00
Jan Steemann 6cf0fa2b4a issue #671: make other graph methods work client-side, too 2013-11-25 10:22:36 +01:00
Jan Steemann 319f5f8dbd removed unused variables 2013-11-18 11:41:57 +01:00
Jan Steemann 5d9cd13c4f issue #671: Method graph.measurement does not exist 2013-11-18 10:39:39 +01:00
Jan Steemann 018bbaa01d issue #671: Method graph.measurement does not exist 2013-11-18 10:28:09 +01:00
Lucas Dohmen 6049ef11fb Graph: Replace a given edge by ID 2013-10-31 15:16:58 +01:00
Lucas Dohmen 04c7cfce33 Graph: Replace a given vertex by ID 2013-10-31 15:16:58 +01:00
Lucas Dohmen b1f36e41f8 Graph Module: Alternatively provide ID instead of Vertex in addEdge 2013-10-31 13:14:51 +01:00
Lucas Dohmen c7b5549b08 Graph Refactoring: Determination of ID pushed to Common 2013-10-31 12:30:14 +01:00
Lucas Dohmen 37b7630efb Code Style 2013-10-31 12:27:50 +01:00
Jan Steemann 08855d5990 added collection status "loading" 2013-10-29 22:35:07 +01:00
Jan Steemann 4c8e0db434 fixed typo in method name 2013-10-08 13:56:20 +02:00
Jan Steemann 3e85159700 jslintified 2013-09-16 18:55:47 +02:00
Lucas Dohmen 70c6b403b2 Pushed the constructor mocking to the module 2013-09-16 15:08:57 +02:00
Jan Steemann ca6244ccc5 jslintified 2013-09-16 13:54:33 +02:00
Lucas Dohmen 27f522aa03 expect docs 2013-09-16 13:28:52 +02:00
Lucas Dohmen 25b87ed3dc Mock: Take arguments instead of array 2013-09-16 13:28:52 +02:00
Lucas Dohmen ae8d0e2be2 expect with fluent interface 2013-09-16 13:28:51 +02:00
Lucas Dohmen 2301cdc930 Converted allow to fluent interface 2013-09-16 13:28:51 +02:00
Lucas Dohmen c1bf1b1d11 Moved stub_and_mock to its own module 2013-09-16 13:28:51 +02:00
Jan Steemann b4efb78f7c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 15:58:49 +02:00
Lucas Dohmen 69286b5742 Foxx: Foxx Transformer is now Foxx Preprocessor 2013-09-04 15:08:15 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Jan Steemann bae9f097fc added _dropDatabase() 2013-09-02 18:04:19 +02:00
Jan Steemann 32ff2f7d39 improve assertion counter 2013-08-27 15:07:41 +02:00
Jan Steemann b598d3443e dirtified jsunity 2013-08-27 12:19:58 +02:00
Jan Steemann 5056512a37 mimetypes for fonts 2013-08-20 10:03:38 +02:00
Jan Steemann ec1a18aac5 fixed jslint warnings 2013-08-19 18:59:22 +02:00
Jan Steemann 9eb1752a7e use AQL LIMIT but still return the unlimited count value 
Still needs documentation and tests
 2013-08-19 18:41:00 +02:00
Frank Celler 8ed7a0115b added transformation 2013-08-07 11:41:49 +02:00
Frank Celler f5016a2ce9 cleanup 2013-07-26 22:46:53 +02:00
Jan Steemann 94051a74c3 return error code from foxx-manager 2013-07-26 14:58:03 +02:00
Jan Steemann aa9209b888 fixed thumbnails 2013-07-26 14:46:33 +02:00
Jan Steemann 4dfdb13d4d improved tabular output 2013-07-26 13:03:59 +02:00
Jan Steemann e359dc29dd INCOMPATIBLE CHANGE: changed AQL user function namespace resolution operator from `:` to `::` 
AQL user-defined functions were introduced in ArangoDB 1.3, and the namespace resolution
operator for them was the single colon (`:`). A function call looked like this:

    RETURN mygroup:myfunc()

The single colon caused an ambiguity in the AQL grammar, making it indistinguishable from
named attributes or the ternary operator in some cases, e.g.

    { mygroup:myfunc ? mygroup:myfunc }

The change of the namespace resolution operator from `:` to `::` fixes this ambiguity.

Existing user functions in the database will be automatically fixed when starting ArangoDB
1.4 with the `--upgrade` option. However, queries using user-defined functions need to be
adjusted on the client side to use the new operator.
 2013-07-18 12:02:28 +02:00
Jan Steemann 9d2a016c5b make jslint happy 2013-07-01 15:50:51 +02:00
Lucas Dohmen 7e7a90753a Fixing the build (this time: Really) 
Sorry, seems like I shouldn't code today 😊
 2013-06-28 19:38:30 +02:00
Lucas Dohmen ccf56dd702 Fix the build 2013-06-28 18:34:26 +02:00
Lucas Dohmen 79a6772667 Code Review: Common Graph Module 2013-06-28 18:14:23 +02:00
Jan Steemann 93f7122099 added missing count() method for server-side cursor 2013-06-24 13:50:03 +02:00
Lucas Dohmen f64c227b16 Graph Module: Even more in Graph Common 2013-06-19 17:09:19 +02:00
Lucas Dohmen 6a84d4726b Graph Module: Pulled Iterator into Common 
Also adjusted it to be useful for the Server Side.
 2013-06-19 17:09:19 +02:00