1
0
Fork 0
Commit Graph

1168 Commits

Author SHA1 Message Date
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
Jan Steemann 7a3635adf9 fixed problem with AQL functions in multiple databases 2014-01-08 09:53:03 +01:00
Jan Steemann 56054d3e66 fixed problem with AQL functions in multiple databases 2014-01-08 09:51:56 +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 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 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 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +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 32a247aa2f added tests for creating / dropping graphs 2013-12-02 15:12:07 +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 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
Lucas Dohmen 2024bdf941 Graph: Fixed `getVertices` 2013-11-20 15:37:56 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +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
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes
Conflicts:
	arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann 86ccaaaf45 do not pollute global namespace 2013-11-11 21:07:38 +01:00
Jan Steemann 9de514d000 removed unused file 2013-11-11 21:07:24 +01:00
Jan Steemann f68113a5d2 do not pollute global namespace 2013-11-11 21:05:05 +01:00
Jan Steemann 6933d66af9 fixed test for Windows 2013-11-11 20:31:11 +01:00
Jan Steemann 6a0d54f1ff fixed test for Windows 2013-11-11 20:30:10 +01:00
Jan Steemann dfe8d82f30 added test for #665 2013-11-11 16:44:39 +01:00
Jan Steemann 303abcc60d issue #665: Hash/skiplist combo madness bit my ass 2013-11-11 16:38:38 +01:00
Jan Steemann ae872007ac updated database creation API 2013-11-07 14:06:44 +01:00
Jan Steemann 819e9a1cb6 fixed user creation on database creation 2013-11-07 13:32:42 +01:00
Jan Steemann 7055299a6e removed shape collections 2013-11-06 17:05:16 +01:00
Jan Steemann 241ad73940 fixed test 2013-11-06 10:16:26 +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
Lucas Dohmen 7d7e014bfe Only drop vertices when dropping a graph if vertices aren't used
elsewhere
2013-10-31 16:41:49 +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
Frank Celler a55fe725a8 fixed version 2013-10-29 14:21:27 +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 9bb89bb654 fixed "error with AQL in user function" 2013-10-16 09:43:24 +02:00
Jan Steemann 79f70c7eea replication applier will now preferrably use collection names instead of collection ids when applying events 2013-10-14 13:45:44 +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 4c8e0db434 fixed typo in method name 2013-10-08 13:56:20 +02:00
Jan Steemann dc69d6fa60 updated documentation 2013-10-02 17:54:39 +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 fa8bc7299a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-09-20 17:47:04 +02:00
Frank Celler 95f6cf1275 fix require bug for modules 2013-09-20 17:46:07 +02:00
Jan Steemann 8a9ce4e86d fixed memory allocation inefficiency 2013-09-20 17:26:26 +02:00
Lucas Dohmen 5eed92d7a5 Foxx: Use defaults in models 2013-09-18 17:00:00 +02:00
Lucas Dohmen 0b89b92efa Foxx: Whitelist Attributes via Model Annotation 2013-09-18 16:22:00 +02:00
Lucas Dohmen efc5ee16dd Foxx: Provide the Model 2013-09-18 15:32:41 +02:00
Lucas Dohmen f5a177932e Foxx: bodyParam 2013-09-18 14:28:24 +02:00
Lucas Dohmen 53746deca7 Foxx: Models can have a Schema now 2013-09-18 12:53:45 +02:00
Jan Steemann 4aee2df2f3 force usage of --upgrade 2013-09-17 15:56:24 +02:00
Lucas Dohmen 43988bb3ae Foxx Repository: Save, Replace, ReplaceById return the model
For convenience, this is quite useful in some cases
2013-09-17 14:37:50 +02:00
Lucas Dohmen fba6c94671 Foxx Repository: replaceById 2013-09-17 14:19:06 +02:00
Jan Steemann aec7b1f8e8 fixed cursors for use in multi-database env 2013-09-17 09:23:05 +02:00
Jan Steemann d91022235e added tests for collections caching 2013-09-17 09:00:18 +02:00
Jan Steemann 3e85159700 jslintified 2013-09-16 18:55:47 +02:00
Lucas Dohmen 0b83a9a9b0 Repository: Replace 2013-09-16 17:25:40 +02:00
Lucas Dohmen d8a8b9bd4e Foxx Repository: firstExample 2013-09-16 16:28:49 +02:00
Lucas Dohmen 7d432a8911 Foxx Repository: byExample 2013-09-16 16:23:07 +02:00
Lucas Dohmen cdf9415650 Do this in one spec, this is just duplication 2013-09-16 16:06:43 +02:00
Lucas Dohmen 6618ac6801 Foxx Repository: Also check the returned object of byId 2013-09-16 15:49:05 +02:00
Lucas Dohmen 70c6b403b2 Pushed the constructor mocking to the module 2013-09-16 15:08:57 +02:00
Lucas Dohmen bbcd9a152a Foxx Repository: byId (Test: Ugly) 2013-09-16 15:08:57 +02:00
Jan Steemann ca6244ccc5 jslintified 2013-09-16 13:54:33 +02:00
Lucas Dohmen 709821e196 Foxx Repository: removeByExample 2013-09-16 13:28:52 +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 9c4c0164e7 Simplifying the two tests 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
Lucas Dohmen 1a273e136c Mini Stub and Mock Framework started
I need my sanity.
2013-09-16 13:28:51 +02:00
Lucas Dohmen b0661f8dc7 Foxx Repository: removeById 2013-09-16 13:28:51 +02:00
Lucas Dohmen 983212cc9d Foxx Repository: Save 2013-09-16 13:28:51 +02:00
Jan Steemann 894180dc20 added test cases 2013-09-13 18:25:28 +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 803bd32ebc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-11 11:42:54 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Lucas Dohmen cabbaeafaf Foxx Repository: Changed API 2013-09-10 10:47:13 +02:00
Lucas Dohmen ad2013e5c4 Foxx: Model#set can now also set multiple attributes 2013-09-10 10:32:08 +02:00
Lucas Dohmen 3d88b57687 Foxx: Removed Repository#all 2013-09-09 14:21:06 +02:00
Lucas Dohmen 545e896e23 Foxx: Repository#save 2013-09-09 14:07:13 +02:00
Lucas Dohmen 5cab0ab025 Foxx: Controller-wide errorResponse 2013-09-09 12:08:10 +02:00
Jan Steemann f65911de53 removed unused error code 2013-09-06 00:55:34 +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 42660cbb5a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 13:04:30 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Lucas Dohmen d1f7d25aa8 Foxx: Some refinements for `.login` and `.logout` 2013-09-04 13:01:56 +02:00
Lucas Dohmen afef07b425 Foxx: Foxx.Application is now Foxx.Controller [BREAKING CHANGE]
The naming was confusing, because Foxx Application had two meanings.
Now we are using the terminology used in MVC frameworks.
2013-09-04 10:43:39 +02:00
Lucas Dohmen f7899bed83 Foxx: Authentication – first version for feedback 2013-09-03 12:11:22 +02:00
Jan Steemann bae9f097fc added _dropDatabase() 2013-09-02 18:04:19 +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 ea27f2f995 fixed tests 2013-08-27 16:13:53 +02:00
Jan Steemann 32ff2f7d39 improve assertion counter 2013-08-27 15:07:41 +02:00
Jan Steemann 75c83a22de fixed rotation 2013-08-27 15:07:29 +02:00
Jan Steemann d30e407c4a only create new journal file when requested
make collection.rotate() publicly available
2013-08-27 14:39:28 +02:00
Lucas Dohmen 8418235769 Foxx: Delegation from Repository to Collection
This also fixes the Doxygen ****
2013-08-27 12:55:16 +02:00
Jan Steemann b598d3443e dirtified jsunity 2013-08-27 12:19:58 +02:00
Jan Steemann 397a73d2f2 fixed tests 2013-08-27 12:19:42 +02:00
Jan Steemann 38abd5bf9e issue #576 2013-08-21 14:02:09 +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
Jan Steemann 5056512a37 mimetypes for fonts 2013-08-20 10:03:38 +02:00
Jan Steemann d5a9fe3578 fixed some test fails 2013-08-19 19:46:22 +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
Lucas Dohmen 503fa74b63 Foxx: Refinement of Query and Path Param methods 2013-08-11 08:51:59 +02:00
Lucas Dohmen 48858cbc84 Foxx: Repositories are easy now 2013-08-08 17:52:07 +02:00
Lucas Dohmen 94c971af9b Foxx: body and rawBody 2013-08-08 11:50:34 +02:00
Lucas Dohmen f0f95148e0 Foxx: Optional fourth parameter for errorHandler for ellaborate hackers 2013-08-08 11:28:09 +02:00
Lucas Dohmen bfb01c0986 Foxx: New Version of the errorResponse function 2013-08-08 11:28:09 +02:00
Frank Celler 8ed7a0115b added transformation 2013-08-07 11:41:49 +02:00
Lucas Dohmen 7eabb27254 Foxx: Use parsed comments as docs 2013-08-06 18:08:06 +02:00
Lucas Dohmen 1819e90b2e Foxx: Preparing existing Tests for new context methods 2013-08-06 17:02:52 +02:00
Lucas Dohmen 2a382abffa applicationContext, not appContext 2013-08-06 16:38:19 +02:00
Lucas Dohmen f0a2aeef4a Foxx: Source Code Transformer is done 2013-08-06 16:13:50 +02:00
Lucas Dohmen 0f6009a3ba Foxx: Tear apart Foxx.Application 2013-08-05 20:10:28 +02:00
Lucas Dohmen b374054740 Foxx: Format Middleware is now optional 2013-08-05 17:05:32 +02:00
Lucas Dohmen ac3cedda34 Foxx: Separating Templates entirely (Step 2) 2013-08-05 16:13:52 +02:00
Lucas Dohmen c9b48f13cd Foxx: Separating Template Middleware from Base, Step 1 2013-08-05 16:13:51 +02:00
Lucas Dohmen b19d3c69fb Foxx: BaseMiddleware Tests pulled out 2013-08-05 16:13:51 +02:00
Lucas Dohmen b3dd4d7b59 Foxx: Model tests pulled out 2013-08-05 13:41:02 +02:00
Lucas Dohmen 6cef711a7b Foxx: Repository tests pulled out 2013-08-05 13:33:06 +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 e86fff18e2 added chunkSize for replication-applier 2013-08-02 11:03:54 +02:00
Jan Steemann 9b6b6e669d added `totalEvents` for logger 2013-08-02 10:11:13 +02:00
Jan Steemann d8690e5fa6 make collection revision id a real revision id 2013-08-02 09:37:46 +02:00
Jan Steemann a7c5350455 added server-id method 2013-08-01 18:27:42 +02:00
Jan Steemann e739089280 extended tests 2013-08-01 17:57:24 +02:00
Jan Steemann f1418ec667 updated tests and docs 2013-08-01 16:53:29 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann c2611f567a bugfixed cap constraint 2013-08-01 13:17:38 +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 461001efd2 split of initial and continuous sync, currently not working 2013-07-30 14:13:49 +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
Frank Celler f978730b25 fixed tests 2013-07-29 10:53:59 +02:00
Frank Celler 4658c91518 fixed tests 2013-07-28 20:33:41 +02:00
Jan Steemann ec6792e11e added authentication 2013-07-28 16:02:21 +02:00
Jan Steemann 70e71e2cad fixed foxx test 2013-07-27 17:29:51 +02:00
Frank Celler ebce19f792 merged 2013-07-26 22:52:52 +02:00
Frank Celler f5016a2ce9 cleanup 2013-07-26 22:46:53 +02:00
Jan Steemann 44d6aecef1 options 2013-07-26 20:05:55 +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 b741209348 handle errors 2013-07-26 11:28:25 +02:00
Lucas Dohmen 8ec4887973 Foxx: No more nickname method – is set automatically
Happy hacking, @fceller, @mchacki and @jsteemann 😉
2013-07-25 22:27:10 +02:00
Lucas Dohmen 84a311fac6 Tiny renaming in test 2013-07-25 21:30:13 +02:00
Lucas Dohmen 42c06b765c Foxx: toJSON splitted into forDB and forClient 2013-07-25 21:28:42 +02:00
Frank Celler 62b61ab12a fixed tests 2013-07-25 18:48:31 +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
Jan Steemann 378e8313f3 added replication docs 2013-07-25 10:54:04 +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 4f14062d10 replication tests 2013-07-24 15:22:45 +02:00
Jan Steemann 0adbe8410f log "rev" 2013-07-23 18:00:29 +02:00
Jan Steemann 5fe1844ee1 replication tests 2013-07-23 15:03:59 +02:00
Jan Steemann bf12b6ec5a fixed journalSize 2013-07-23 11:57:56 +02:00
Jan Steemann f49ae77bc5 include replication tests 2013-07-23 11:19:41 +02:00