1
0
Fork 0
Commit Graph

464 Commits

Author SHA1 Message Date
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
a-brandt c175c73f97 added some missing changes 2013-01-15 14:07:16 +01:00
a-brandt f2288b5900 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 09:08:28 +01:00
a-brandt 60c8ad808f Changed graph moudule to use _key 2013-01-15 09:07:31 +01:00
Jan Steemann 2a3293a59e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-14 14:12:26 +01:00
Jan Steemann 848cc1ae28 added CollectionDatasourceFactory 2013-01-14 14:08:28 +01:00
Lucas Dohmen 7189151f93 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 13:37:15 +01:00
Lucas Dohmen bad6578ce5 Frank: Templates.
You can now use templates (currently via Underscore, but is expandable)
in Frank.
2013-01-14 13:35:43 +01:00
Jan Steemann c8b55b9b4d added patch & head methods 2013-01-14 13:22:02 +01:00
Lucas Dohmen a8561d0121 Frank: Put, Post, Delete 2013-01-14 09:34:25 +01:00
Michael Hackstein f32c4b2ae4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 02:36:51 +01:00
Michael Hackstein 96a5e832b0 Added includeMatchingAttributesFilter 2013-01-14 02:36:45 +01:00
Lucas Dohmen ef8bb55165 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 02:36:40 +01:00
Lucas Dohmen 9052dbdcbe Frank: Added some simple convenience functions to the response
Will make everything more comfy.
Amazing.
And wonderful 🦄
The middleware is not yet attached.
2013-01-14 02:35:27 +01:00
Michael Hackstein 1fae3deaa8 Merged conflict 2013-01-14 01:21:00 +01:00
Michael Hackstein 913bb09c67 Expand edges with labels 2013-01-14 01:18:28 +01:00
Michael Hackstein a91d92917e Added follow edges with labels 2013-01-14 01:02:47 +01:00
Jan Steemann f7d8df846b fixed test 2013-01-14 00:24:00 +01:00
Jan Steemann 4761e9c28c added more tests 2013-01-14 00:02:10 +01:00
Michael Hackstein 1f492f2444 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 00:00:53 +01:00
Michael Hackstein c451776ddf creation of first test datasource in function 2013-01-14 00:00:46 +01:00
Jan Steemann 6acc85389c fixed "any" traversal 2013-01-13 23:56:28 +01:00
Lucas Dohmen a29f2f7370 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 23:43:09 +01:00
Lucas Dohmen ffeca77e1a First Version of Frank
* Added Underscore (We still need to run all tests to see if it works
  entirely)
* Added the first version of Frank with a few thoughts on how to
  continue working on it
2013-01-13 23:42:01 +01:00
Jan Steemann ad14130aa0 some tests for traversal 2013-01-13 23:40:27 +01:00
Jan Steemann b42212e559 removed "redeclaration of bind parameter" 2013-01-13 23:25:27 +01:00
Jan Steemann 0ce59432e0 edge & vertex uniqueness for TRAVERSE 2013-01-13 22:56:14 +01:00
Jan Steemann a2373b7036 added any expander 2013-01-13 14:53:26 +01:00
Michael Hackstein cc2df18db8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 14:44:25 +01:00
Michael Hackstein f946da1772 Added datasource object for manually created graphs 2013-01-13 14:44:06 +01:00
Michael Hackstein ebec929394 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 13:52:02 +01:00
Michael Hackstein 8bb5096e42 First version of expand graphs by labels 2013-01-13 13:51:46 +01:00
Frank Celler bad4c293ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 13:50:51 +01:00
Jan Steemann 8bf8a733a2 added traversal function 2013-01-13 13:48:23 +01:00
Frank Celler fe3e4e5b24 cosmetic changes 2013-01-13 12:40:22 +01:00
Michael Hackstein e0dc0be787 Removed unused wrapper filter 2013-01-13 11:36:02 +01:00
Michael Hackstein 8686dbe51b Added combine filters, and min/maxDepth filters 2013-01-13 11:26:43 +01:00
Jan Steemann e23e6e3ae6 changed return value for filter functions 2013-01-13 00:55:03 +01:00
Jan Steemann baaaf81cd3 changed the API for traversals 2013-01-13 00:17:11 +01:00
Jan Steemann 8b13d4687a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-12 21:30:12 +01:00
Jan Steemann 227a92aa1c added test cases, some fixes 2013-01-12 21:29:13 +01:00
Frank Celler 12b611d102 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-12 21:08:35 +01:00
Jan Steemann 8080b2f501 test cases for collection-based expanders 2013-01-12 20:42:43 +01:00
Jan Steemann f53b09c64a adjusted traversal API 2013-01-12 18:26:57 +01:00
Frank Celler 514244868d added printf 2013-01-11 22:39:03 +01:00
Frank Celler 4cda9c48f1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-11 22:25:52 +01:00
Frank Celler ecb2602ba0 fixed path 2013-01-11 21:11:31 +01:00
Jan Steemann 79f40a5822 fixed tests 2013-01-11 20:53:02 +01:00
Jan Steemann b694d72742 added tests 2013-01-11 15:01:57 +01:00
Jan Steemann 196e3872b6 fixed a bug width non-expanded nodes 2013-01-11 14:57:31 +01:00
Jan Steemann a45da0ce05 added path tests 2013-01-11 14:42:41 +01:00
Jan Steemann 3cdac5f258 tests paths 2013-01-11 14:35:12 +01:00
Jan Steemann 0874d95467 more tests 2013-01-11 14:30:58 +01:00
Jan Steemann f34b5085ee more tests 2013-01-11 14:17:42 +01:00
Jan Steemann 5c19f2d196 cleaned up traversal code, initial unittest 2013-01-11 13:59:03 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
2013-01-10 18:00:25 +01:00
Frank Celler 2e6c075405 added getPeerVertex 2013-01-10 15:12:05 +01:00
Frank Celler 1612f22319 moved graph to org/arangodb/graph 2013-01-09 22:49:56 +01:00
Frank Celler 22357a4cfa removed debug output 2013-01-09 15:46:29 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
2013-01-09 15:30:21 +01:00
Frank Celler 812360145e added flush 2013-01-09 11:47:17 +01:00
Jan Steemann a05edcdccc fixed JS print output 2013-01-08 00:28:12 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler f5b1476d78 fixed jslint warnings 2013-01-06 11:05:28 +01:00
Frank Celler fb881581e1 fixed GUI 2013-01-06 01:31:32 +01:00
Frank Celler 3826a4603e removed print.js 2013-01-06 00:23:40 +01:00
Frank Celler 337cee7606 fixed jslint warnings 2013-01-05 23:59:44 +01:00
Frank Celler 7be1c01bda removed linked in JavaScript code, separate files for 'fs' and 'console' 2013-01-05 23:24:10 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
2013-01-05 11:16:50 +01:00
Jan Steemann 6dce10de80 slightly fixed the print function for arrays & objects 2013-01-04 15:50:55 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1
Conflicts:
	js/common/bootstrap/modules.js
2013-01-03 18:57:18 +01:00
Frank Celler 06e191877a added jslint target 2013-01-03 17:45:35 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Jan Steemann b48d039e3f issue #327 2012-12-27 18:26:04 +01:00
Jan Steemann 110fb8ade6 issue #327 2012-12-27 18:14:19 +01:00
Jan Steemann e28d9b9a93 issue #327: fixed javascript parse errors 2012-12-27 18:05:02 +01:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann 599428859e issue #330 2012-12-21 22:01:51 +01:00
Jan Steemann 2b84d417f8 issue #330 2012-12-21 21:54:55 +01:00
Jan Steemann 96637435ab fulltext: more query operators, more tests, more controlled memory usage and statistics 2012-12-18 14:56:06 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Frank Celler 051705c7b9 Merge branch '1.1' of github.com:triAGENS/ArangoDB
Conflicts:
	.gitignore
	CHANGELOG
	Doxygen/Examples.ArangoDB/arangosh-options
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	UnitTests/HttpInterface/api-collection-spec.rb
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Documentation/first-steps-arangodb.dox
	arangod/Documentation/user-manual.dox
	arangod/HashIndex/compare.h
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hasharray.h
	arangod/HashIndex/hashindex.h
	arangod/V8Server/v8-actions.cpp
	arangod/VocBase/simple-collection.c
	arangosh/V8Client/V8ClientConnection.cpp
	arangosh/V8Client/V8ClientConnection.h
	arangosh/V8Client/arangoimp.cpp
	arangosh/V8Client/arangosh.cpp
	configure
	configure.ac
	html/admin/css/layout.css
	html/admin/index.html
	html/admin/js/master.js
	js/actions/system/api-system.js
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	js/server/js-server.h
	js/server/server.js
	lib/BasicsC/voc-errors.c
	lib/V8/v8-globals.h
2012-12-05 12:34:08 +01:00
Jan Steemann efde7b5efa first test cases for fulltext index 2012-12-03 23:55:46 +01:00
Jan Steemann aed99d178d fixed assertion 2012-12-03 15:31:08 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Jan Steemann d60888e970 replaced arango-upgrade script with server startup option --upgrade 2012-12-03 13:45:58 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
2012-12-03 13:02:59 +01:00
Jan Steemann 59461d0c4b added functionality to add and remove users programatically
removed arango-password script
2012-12-03 11:42:30 +01:00
Jan Steemann fec05c853d issue #312 2012-12-03 09:58:00 +01:00
Jan Steemann 30a47496b0 issue #312 2012-12-03 09:55:44 +01:00
Jan Steemann 8c7ca55512 issue #300 2012-12-01 03:15:39 +01:00
Jan Steemann cbad6b526a make collections accesible via name instead of id.
this allows using the collection name instead of ids in _from, _to, _id etc.
2012-11-28 13:16:15 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
2012-11-27 12:34:58 +01:00