1
0
Fork 0
Commit Graph

498 Commits

Author SHA1 Message Date
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
Frank Celler 98ed813138 added json reading 2014-02-09 18:27:47 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Jan Steemann 4339d5aab6 removed unused variable 2014-02-02 09:21:43 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +01:00
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster.
This still has a freeing too early bug with TRI_json_t.
2014-01-28 16:49:44 +01:00
Max Neunhoeffer 7d5723756f Implement DELETE REST method on the coordinator. 2014-01-24 21:31:58 +01:00
Max Neunhoeffer f5c274e8c0 Fix error handling and another bug in create document for cluster. 2014-01-24 10:35:37 +01:00
Max Neunhoeffer 9230f5020c First case of create document is working on cluster. 2014-01-23 16:16:06 +01:00
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
Jan Steemann d10748155f follow up for issue #738 2014-01-21 13:31:01 +01:00
Jan Steemann f99f362f07 small improvement for issue #738 2014-01-21 13:30:38 +01:00
Alan Plum 3e653e303d Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-21 13:28:46 +01:00
Jan Steemann 80e8250d54 fixed segfault 2014-01-21 12:50:35 +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 a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann e99f813e0a follow up for issue #738 2014-01-17 22:58:43 +01:00
Jan Steemann ed08a41a11 small improvement for issue #738 2014-01-17 22:01:24 +01:00
Jan Steemann c0aa6157ff Merge branch 'globals-filename-dirname' of https://github.com/pluma/ArangoDB into devel 2014-01-17 21:41:44 +01:00
Alan Plum 371bba964b Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-17 21:31:16 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Jan Steemann f760d056df added startupPath value to result of /_api/foxx/config
Conflicts:
	js/actions/api-foxx.js
2014-01-15 18:10:26 +01:00
Jan Steemann cfdbb1996e added startupPath value to result of /_api/foxx/config 2014-01-15 18:05:27 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Frank Celler 13d1e5e5ab Merge pull request #727 from pluma/manifest-lib-default-local
App requires should be module-relative by default. Fixes #721
2014-01-11 12:02:25 +01:00
Frank Celler 2fd7bfcbc3 Merge pull request #727 from pluma/manifest-lib-default-local
App requires should be module-relative by default. Fixes #721
2014-01-11 02:35:31 -08: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
Frank Celler 005144ff05 Merge pull request #723 from pluma/npm-default-package-main
Default package "main" to "index". Fixes #719.
2014-01-09 23:07:38 +01:00
Frank Celler 9582ea8c94 Merge pull request #723 from pluma/npm-default-package-main
Default package "main" to "index". Fixes #719.
2014-01-09 14:05:06 -08:00
Alan Plum 1a5f4c98f2 Fixed package file resolution. Fixes #718, #720. 2014-01-09 23:03:30 +01:00
Alan Plum 3d511060ce App requires should be module-relative by default. Fixes #721 2014-01-09 22:06:57 +01:00
Alan Plum 6c0f9ef6b0 Fixed package file resolution. Fixes #718, #720. 2014-01-09 19:06:15 +01:00
Alan Plum 1b72d07efc Default package "main" to "index". Fixes #719. 2014-01-09 18:17:20 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2013-12-20 15:35:50 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups
Conflicts:
	CHANGELOG
2013-12-13 16:08:58 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 2965accb05 add current state to agency 2013-12-06 14:23:02 +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 9a1aa7a4cc removed superfluous error codes 2013-11-22 13:49:05 +01:00
Jan Steemann 0eeac02a91 removed unused error codes 2013-11-22 13:23:23 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann 0814d4de22 updated documentation for console, added section about Foxx development 2013-10-17 13:09:39 +02:00
Jan Steemann cd5d228e77 moved path checks from --upgrade to server start and database creation 2013-10-16 15:30:13 +02:00
Jan Steemann 5b2820a3e8 worked around arguments.callee 2013-10-10 08:40:43 +02:00
Jan Steemann e3df92d929 fix Windows file handling 2013-10-09 14:07:21 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 73f0405ead added documentation for endpoints 2013-09-23 16:21:02 +02:00
Frank Celler 95f6cf1275 fix require bug for modules 2013-09-20 17:46:07 +02:00
Jan Steemann 4aee2df2f3 force usage of --upgrade 2013-09-17 15:56:24 +02:00
Jan Steemann 6ff314de0e runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Jan Steemann 5bc1e5ecea dropping databases, unfinished 2013-09-11 12:47:27 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann f65911de53 removed unused error code 2013-09-06 00:55:34 +02:00
Jan Steemann 0aca109a89 removed html/admin, / now redirects to /_admin/aardvark by default 2013-08-29 12:59:56 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann 1a6f3c2981 added new error codes 2013-08-20 11:12:08 +02:00
Frank Celler 8ed7a0115b added transformation 2013-08-07 11:41:49 +02:00
Jan Steemann 5f1bfcf9cd documentation for replication 2013-08-02 15:28:30 +02:00
Jan Steemann 1fc1bb108d added replication client tests 2013-08-02 11:45:55 +02:00
Jan Steemann a7c5350455 added server-id method 2013-08-01 18:27:42 +02:00
Jan Steemann 48fbdb1b6a cap constraint for replication logger 2013-07-31 16:56:56 +02:00
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann 6b5900e8e0 updated replication api 2013-07-30 09:54:39 +02:00
Jan Steemann ec6792e11e added authentication 2013-07-28 16:02:21 +02:00
Jan Steemann 44d6aecef1 options 2013-07-26 20:05:55 +02:00
Jan Steemann b741209348 handle errors 2013-07-26 11:28:25 +02:00
Frank Celler 709e09d04e added install command 2013-07-25 18:33:24 +02:00
Frank Celler 1b6dfad627 new name convention 2013-07-25 17:25:39 +02:00
Frank Celler 2a3ac8e32f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-25 13:48:16 +02:00
Jan Steemann 3113fa30ee fixed jslint warnings 2013-07-25 11:38:07 +02:00
Frank Celler 78809a5cc8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-25 10:05:17 +02:00
Jan Steemann 5fe1844ee1 replication tests 2013-07-23 15:03:59 +02:00
Frank Celler 97aa4f6597 cosmetics 2013-07-21 12:01:30 +02:00
Frank Celler 5aa74e9822 limit string on output 2013-07-21 10:17:51 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Jan Steemann b5e26235a7 replication configuration 2013-07-12 17:37:24 +02:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Jan Steemann c6ff61b159 added new error code 2013-07-09 12:33:10 +02:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann 230f0ddcc3 added errors 2013-07-04 15:51:24 +02:00
Jan Steemann f5968a4646 handle a master's state response 2013-07-04 10:13:09 +02:00
Jan Steemann 44c9ca4e90 issue #565, plus a few usability fixxes for aal.search() 2013-07-03 14:06:57 +02:00
Jan Steemann 4ed7ac6376 improved error messages 2013-06-27 14:49:33 +02:00
Jan Steemann 2d7edbef96 added db._exists() 2013-06-21 21:50:00 +02:00
Jan Steemann b1f243d296 fixed segfault for too big shapes, make shape collection filesize adaptive 2013-06-20 19:14:14 +02:00
Jan Steemann d9c0d588f9 added internal.adminDirectory 2013-06-20 15:47:48 +02:00
Jan Steemann 9599a021b9 moved some graph traversal validation into the traversal module
- that simplifies some of the traversal-calling routines
- make returning error codes more consistent (specific 404 errors when
referring to unknown collections instead of simple 400 errors)
- optionally limit traversals to a certain number of iterations so they
  don't run endlessly in cyclic graphs
2013-06-12 17:04:47 +02:00
Oreste Panaia 35ab2e6f62 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-10 17:05:58 +08:00
Jan Steemann f619c7f51e jslint 2013-06-07 14:48:39 +02:00
Oreste Panaia 8a95c1c2a8 update 2013-06-05 19:52:34 +08:00
Oreste Panaia 70bc62a5a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-21 17:47:22 +08:00
Oreste Panaia b764b4f71e extended errors for skiplist 2013-05-21 17:45:19 +08:00
Frank Celler b4794e6655 fixed issue #530: ReferenceError: ArangoError is not a constructor 2013-05-20 00:02:25 +02:00
Jan Steemann ed77c19e16 added derived file 2013-05-17 15:59:58 +02:00
Jan Steemann 8790a69b8e jslint 2013-05-14 12:40:30 +02:00
Jan Steemann c51f70de05 removed hard-coded groups from statistics web interface
now all statistics are dynamic
removed redundant code in statistics web interface
2013-05-14 02:36:01 +02:00
Jan Steemann eb8325ef34 fixed typo in error message 2013-05-08 11:10:34 +02:00
Frank Celler 2d5af26466 added safeJoin 2013-05-05 21:50:43 +02:00
Frank Celler 581c667a5a fixed jslint 2013-05-04 21:52:09 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Oreste Panaia 115d87196c sync windows dev 2013-04-29 23:13:06 +08:00
Oreste Panaia c42c0bf565 sync dev for windows 2013-04-29 21:49:28 +08:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
Frank Celler 186694dc22 added safety check for packages which define main with .js 2013-04-23 22:42:11 +02:00
Frank Celler fb8d8799c3 moved document of console to JSModuleConsole, added packages and node 2013-04-23 18:39:25 +02:00
Oreste Panaia 1ddbd2e4d9 update 2013-04-23 19:02:46 +08:00
Oreste Panaia b83d90f021 skiplist transaction support 2013-04-23 18:56:26 +08:00
Frank Celler cbc2ab93ba fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00
Frank Celler 7bfce45ece added more node modules 2013-04-21 22:00:54 +02:00
Frank Celler a75736a148 added Buffer from node 2013-04-21 21:45:39 +02:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +02:00
Frank Celler 79330daa90 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-17 10:47:35 +02:00
Frank Celler 68a7a55c6d fixed typo (plattform) 2013-04-17 10:46:53 +02:00
Jan Steemann b667e458fc fixed error messages 2013-04-16 11:55:17 +02:00
Jan Steemann e3d8db0b71 issue #474 2013-04-15 09:30:50 +02:00
Jan Steemann dee5adb9f5 added client side API for transactions 2013-04-12 23:18:48 +02:00
Jan Steemann 9b5849f650 updated documentation 2013-04-12 00:42:02 +02:00
Jan Steemann 229893c086 documentation for transactions 2013-04-12 00:03:05 +02:00
Jan Steemann 997c14e032 fixed jslint warnings 2013-04-11 20:24:09 +02:00
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Frank Celler f373615268 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/V8Server/v8-actions.cpp
2013-04-10 21:47:51 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Jan Steemann ffb2a0f545 added generated file 2013-04-10 08:51:55 +02:00
Frank Celler d7443f5caa default path needs the type 2013-04-08 16:23:57 +02:00
Frank Celler 738a4dde75 nicer printing of objects 2013-04-08 16:23:28 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	lib/Basics/StringUtils.cpp
2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Jan Steemann 3a8783b26a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-05 15:35:23 +02:00
Jan Steemann edf513551f error handling 2013-04-05 15:35:08 +02:00
Frank Celler b50bc6dd24 added thumbnail 2013-04-05 14:48:15 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Frank Celler dcb65a92bf fixed error messages 2013-04-04 23:19:27 +02:00
Frank Celler 37e134ff50 new Foxx 2013-04-04 18:56:38 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Frank Celler a6be9ceaa3 added node assert module 2013-04-03 16:48:38 +02:00
Frank Celler 0ba6329a12 added trace 2013-04-03 16:32:04 +02:00