1
0
Fork 0
Commit Graph

11030 Commits

Author SHA1 Message Date
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Alan Plum 7ff989687c
Rebuild aardvark 2016-04-19 15:06:56 +02:00
Alan Plum 4c3319de25
Extract session storage.save
Also fix transports
2016-04-19 15:06:55 +02:00
Max Neunhoeffer 5c232edee2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 14:44:35 +02:00
Max Neunhoeffer 4beb3deac8 New agency test. 2016-04-19 14:43:35 +02:00
Alan Plum d0ce74803c
Make sure session exists before checking it in aardvark 2016-04-19 13:58:50 +02:00
hkernbach 2bd9dfea61 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 13:16:44 +02:00
hkernbach 179e5ee7a5 scss, views 2016-04-19 13:15:16 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 051a153252
@arangodb/foxx -> @arangodb/foxx/legacy 2016-04-18 18:01:08 +02:00
Alan Plum c55eeac990
Fix FM nightly test 2016-04-18 18:01:07 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 9f25f44a87
Don't check the Foxx store unless you actually need it 2016-04-18 18:01:06 +02:00
Alan Plum 777848472d
standalone.html -> index.html 2016-04-18 18:01:05 +02:00
Alan Plum 02ee7c5489
Fix Foxx session transports error message 2016-04-18 18:01:04 +02:00
Alan Plum 4b509adf15
Nicer warnings/errors 2016-04-18 18:01:04 +02:00
Alan Plum c2b6f33407
Fix aardvark redirect 2016-04-18 18:01:03 +02:00
Alan Plum fae673a7f3
Fix aardvark more 2016-04-18 18:01:02 +02:00
Alan Plum 39754d700f
Unbreaky aardvark 2016-04-18 18:01:01 +02:00
Alan Plum c1fef91659
More aardvark modernization 2016-04-18 18:01:01 +02:00
Alan Plum 2382e6a6a7
Foxx services should survive even if API docs are broken 2016-04-18 18:01:00 +02:00
Alan Plum 96d0f5f4ab
QueryParam and friends should allow omitting schemas 2016-04-18 18:00:59 +02:00
Alan Plum 8224153c72
Prettier JSON responses in dev mode 2016-04-18 18:00:58 +02:00
Alan Plum 7bef673ef8
Fix empty descriptions in swagger 2016-04-18 18:00:58 +02:00
Alan Plum 954aced326
Use res.throw for aardvark auth 2016-04-18 18:00:57 +02:00
Alan Plum b4f99a3953
Remove unused Aardvark foxxTemplates.js 2016-04-18 18:00:56 +02:00
Alan Plum 46822f2335
Split body parsing and validation, add error cause 2016-04-18 18:00:56 +02:00
Alan Plum 7364c428e7
Add SyntheticRequest#database 2016-04-18 18:00:55 +02:00
Alan Plum aaaa3ca8f8
Add SyntheticResponse#throw 2016-04-18 18:00:54 +02:00
Alan Plum 106f14cffb
Nicer route error logging logic 2016-04-18 18:00:54 +02:00
Alan Plum b475e3cc09
Allow passing swagger object to swagger handler 2016-04-18 18:00:53 +02:00
Alan Plum 45290e3d63
Port d66616d to FOTF 2016-04-18 18:00:52 +02:00
Alan Plum ead1c48493
Lint! 2016-04-18 18:00:51 +02:00
Alan Plum 87d86065d6
Make sure system collections used by aardvark always exist 2016-04-18 18:00:51 +02:00
Alan Plum 016e5c9163
Migrated gharial to FOTF 2016-04-18 18:00:50 +02:00
Alan Plum b82f29fb42
Disable removed system services 2016-04-18 18:00:50 +02:00
Alan Plum 3fdd0a90e2
Better handle wrapped errors in Foxx 2016-04-18 18:00:49 +02:00
Alan Plum 30d6200a60
Allow passing strings as status code in some cases 2016-04-18 18:00:48 +02:00
Alan Plum e22e656f5d
Remove _system services
* cerberus was only used by MyArangoDB
* simple-auth is now @arangodb/foxx/auth
* sessions is replaced by @arangodb/foxx/sessions/storage/_system
* users should no longer be used anyway
2016-04-18 18:00:48 +02:00
Alan Plum fc05c019d2
Fix aardvark auth 2016-04-18 18:00:47 +02:00
Alan Plum 64d2b38025
Add _system sessions storage 2016-04-18 18:00:47 +02:00
Alan Plum 9e021cbc57
Fix transport.set call in sessions middleware 2016-04-18 18:00:46 +02:00
Alan Plum 5d765be524
Port Aardvark to FOTF 2016-04-18 18:00:46 +02:00
Alan Plum 5a3e42e289
Service#thumbnail should use path instead of base64 2016-04-18 18:00:46 +02:00
Alan Plum edbe1e966c
Add createSwaggerHandler to context 2016-04-18 18:00:45 +02:00
Alan Plum f13a827158
Fix new swagger 2016-04-18 18:00:45 +02:00
Alan Plum f6a0e4619d
Allow clearing removed sessions in transport 2016-04-18 18:00:45 +02:00
Alan Plum fbd2f3203a
Only serialize session if it is set 2016-04-18 18:00:44 +02:00
Alan Plum 5d69166a89
Fix cookie session transport signing 2016-04-18 18:00:44 +02:00
Alan Plum ef88a9d6eb
Consistency with args 2016-04-18 18:00:43 +02:00
Alan Plum 2dcadc06ea
Request path should be relative to service mount 2016-04-18 18:00:43 +02:00
Alan Plum a53e211452
Nested routers should allow sloppy paths too 2016-04-18 18:00:42 +02:00
Alan Plum 6473209430
Fix hasOwnProperty call 2016-04-18 18:00:42 +02:00
Alan Plum 40d66f932d
Allow defaultDocument but no default 2016-04-18 18:00:42 +02:00
Alan Plum f7f841c7c9
If auth config is a string, it's a method 2016-04-18 18:00:42 +02:00
Alan Plum 6fc9b185eb
hasOwnProperty is now global 2016-04-18 18:00:41 +02:00
Alan Plum 438b50e652
Extend Foxx session storage a bit 2016-04-18 18:00:41 +02:00
Alan Plum 989f87f732
Allow adding extra fields to error response from exception 2016-04-18 18:00:41 +02:00
Alan Plum 1430e24c3d
Linting 2016-04-18 18:00:41 +02:00
Alan Plum 4c42cc3e2f
Add FOTF swagger 2016-04-18 18:00:40 +02:00
Alan Plum 898f9bdcac
Move swagger into Foxx legacy 2016-04-18 18:00:40 +02:00
Alan Plum 80f7ffe876
Move OAuth2 into Foxx 2016-04-18 18:00:40 +02:00
Alan Plum 6c0cdeb4f1
Move simple-auth into Foxx 2016-04-18 18:00:40 +02:00
Alan Plum bb6b05b724
Make header transport API consistent with cookie 2016-04-18 18:00:39 +02:00
Alan Plum 5dfdd74c74
Add session collectionStorage 2016-04-18 18:00:39 +02:00
Alan Plum cae8a6607b
Add ServerRequest#params 2016-04-18 18:00:39 +02:00
Alan Plum 27e4b43fa6
Fixup add ArangoCollection#isArangoCollection 2016-04-18 18:00:39 +02:00
Alan Plum 71ea230d4f
Fix defaultDocument in Foxx legacy
Opt-out values (i.e. empty strings) are now handled correctly again.
2016-04-18 18:00:38 +02:00
Alan Plum 9cf8d347ad
More SyntheticResponse tests 2016-04-18 18:00:38 +02:00
Alan Plum 21a1720d86
Add SyntheticResponse tests 2016-04-18 18:00:37 +02:00
Alan Plum 18ff55b7dd
Add SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 2993b73c25
More SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 4ef87a2aef
Add shell-foxx-response-spec.js 2016-04-18 18:00:37 +02:00
Alan Plum 15388552f9
Formatting 2016-04-18 18:00:36 +02:00
Alan Plum ee90edfe45
Fix SyntheticRequest 2016-04-18 18:00:36 +02:00
Alan Plum 2da95acee2
Add shell-foxx-request-spec.js 2016-04-18 18:00:36 +02:00
Alan Plum 83bd3f4ace
Allow manual mime types in manifest
Fixes #1702.
2016-04-18 18:00:36 +02:00
Alan Plum 926f02ace5
Use mime-types 2016-04-18 18:00:35 +02:00
Alan Plum 5a6fa4a253
Generator should support edge collections
Fixes #1718.
2016-04-18 18:00:35 +02:00
Alan Plum ca6bb83a84
More tests 2016-04-18 18:00:35 +02:00
Alan Plum ab0db4e414
Actually don't add 200 response by default 2016-04-18 18:00:35 +02:00
Alan Plum 72f65bd8e3
Response description -> reason 2016-04-18 18:00:34 +02:00
Alan Plum 5b4b3852ad
Better default 200 response 2016-04-18 18:00:34 +02:00
Alan Plum dcc2101d09
Yak shave 2016-04-18 18:00:34 +02:00
Alan Plum 22a8b5ec65
Add util.inline 2016-04-18 18:00:34 +02:00
Alan Plum b01a3da328
Fix swagger responses 2016-04-18 18:00:33 +02:00
Alan Plum 6bc2a10867
Fixup generator 2016-04-18 18:00:33 +02:00
Alan Plum a31bf33892
Basic swagger tests 2016-04-18 18:00:33 +02:00
Alan Plum a71fc92c6f
Add default body/response descriptions 2016-04-18 18:00:33 +02:00
Alan Plum 248e8e747e
Response descriptions are mandatory in Swagger 2016-04-18 18:00:32 +02:00
Alan Plum fddc35df67
mv shell-foxx-router-spec to shell tests 2016-04-18 18:00:32 +02:00
Alan Plum d7f514693b
Implement name reversal 2016-04-18 18:00:32 +02:00
Alan Plum bd4bc8eb96
SyntheticRequest: add baseUrl and makeAbsolute 2016-04-18 18:00:31 +02:00
Alan Plum 31526a8227
Clean up templates 2016-04-18 18:00:31 +02:00
Alan Plum b8d082941a
Fix legacy swagger 2016-04-18 18:00:31 +02:00
Alan Plum 4f2dc536ee
Tightening
Convert some lets to consts and eliminate the redundancy in Router.
2016-04-18 18:00:31 +02:00
Alan Plum 1f347b3145
Update license headers 2016-04-18 18:00:30 +02:00
Alan Plum 2ff1371e19
Port Foxx service generator to FOTF 2016-04-18 18:00:30 +02:00
Alan Plum d971780ba8
Make routing actually work 2016-04-18 18:00:30 +02:00
Alan Plum d2d62a97bc
Make FOTF swagger docs visible to Foxx Swagger 2016-04-18 18:00:30 +02:00
Alan Plum ad717505fe
Add pluck to util 2016-04-18 18:00:29 +02:00
Alan Plum 95613be7c6
Mark ArangoDB result sets and errors
This makes it easier to recognize them (see joi.isJoi).
2016-04-18 18:00:29 +02:00
Alan Plum 8d2cc4041d
Implement request/response body handling 2016-04-18 18:00:29 +02:00
Alan Plum a5ffbcf736
Add stub tests for swagger 2016-04-18 18:00:29 +02:00
Alan Plum 24ab288d57
Move body handling into dispatch 2016-04-18 18:00:28 +02:00
Alan Plum d23f42fafc
No response schema if no response type 2016-04-18 18:00:28 +02:00
Alan Plum 3b3bfcbd95
If status 200 is set to no response, imply 204 2016-04-18 18:00:28 +02:00
Alan Plum 1197b6fa22
Use default schema for default response 2016-04-18 18:00:28 +02:00
Alan Plum 47d9ab07f4
Nevermind response headers for now 2016-04-18 18:00:27 +02:00
Alan Plum 21428c7f4b
Use joi-to-json-schema 2016-04-18 18:00:27 +02:00
Alan Plum bf253d07b3
Add operation.responses 2016-04-18 18:00:27 +02:00
Alan Plum 774a47a185
Add joi-to-json-schema dep 2016-04-18 18:00:27 +02:00
Alan Plum a00ac0d96f
Swaggerify route params 2016-04-18 18:00:26 +02:00
Alan Plum d810a335ac
Better handle response/request body docs 2016-04-18 18:00:26 +02:00
Alan Plum 04f59fcdb4
shell-foxx-router-spec to mocha 2016-04-18 18:00:26 +02:00
Alan Plum ff0bf1a182
Add basic swagger generator stub 2016-04-18 18:00:26 +02:00
Alan Plum 91cfcb2fc9
Add SwaggerContext#_merge 2016-04-18 18:00:25 +02:00
Alan Plum 8ab3e4a161
Add tokenize.reverse 2016-04-18 18:00:25 +02:00
Alan Plum bfe66a4ad0
SwaggerContext#response per status code 2016-04-18 18:00:25 +02:00
Alan Plum 27c203bbb2
SwaggerContext should treat missing path as empty 2016-04-18 18:00:25 +02:00
Alan Plum 244345d178
SyntheticRequest#originalUrl should encode db 2016-04-18 18:00:25 +02:00
Alan Plum 314d19d20d
Extract router tree 2016-04-18 18:00:24 +02:00
Alan Plum 2633b0109b
Extract dispatch from router 2016-04-18 18:00:24 +02:00
Alan Plum 95dea0cd14
Yakshaving 2016-04-18 18:00:24 +02:00
Alan Plum 572952864c
Expose service context in request obj 2016-04-18 18:00:24 +02:00
Alan Plum 0156051c37
Basic implementation of SyntheticResponse 2016-04-18 18:00:23 +02:00
Alan Plum 9e3833eadd
Basic implementation of SyntheticRequest
Fixes #1191.
2016-04-18 18:00:23 +02:00
Alan Plum 5ba054210b
Fix router.resolve (req.method => req.requestType) 2016-04-18 18:00:23 +02:00
Alan Plum 34a1835532
Fix legacy mode applicationContext injection 2016-04-18 18:00:23 +02:00
Alan Plum aa4b41763e
Yakshaving
Naming things is hard.
2016-04-18 18:00:22 +02:00
Alan Plum 12e27cac00
Implement queryParam & body validation 2016-04-18 18:00:22 +02:00
Alan Plum 322c9c41b8
Lint shell-foxx-router-spec.js 2016-04-18 18:00:22 +02:00
Alan Plum 4b0fd593ce
Implement rudimentary route handling 2016-04-18 18:00:22 +02:00
Alan Plum 6637a0cd16
Make more route context attributes private 2016-04-18 18:00:21 +02:00
Alan Plum 8230d73406
More versatile route lookup 2016-04-18 18:00:21 +02:00
Alan Plum 6e6a9a3918
Add more tests & fix middleware resolution 2016-04-18 18:00:21 +02:00
Alan Plum 6ea15298bd
Partially implement routing for Foxx 2016-04-18 18:00:21 +02:00
Alan Plum e78e6476ab
Implement routing logic for router 2016-04-18 18:00:20 +02:00
Alan Plum 7bf1e5e502
Add router to Foxx services
Fixes #1189.
2016-04-18 18:00:20 +02:00
Alan Plum 8260da9d35
Implement basic router
Fixes #1164.
Fixes #1759.
2016-04-18 18:00:20 +02:00
Alan Plum 4495a2edc8
Implement session middleware 2016-04-18 18:00:20 +02:00
Alan Plum c934cbc9f2
Implement mounting legacy apps 2016-04-18 18:00:19 +02:00
Alan Plum bc0b5d40c4
Remove context._prefix 2016-04-18 18:00:19 +02:00
Alan Plum 5f91c5399c
Tidy up manifest props 2016-04-18 18:00:19 +02:00
Alan Plum 54fb1a73d8
foxx -> foxx/legacy 2016-04-18 18:00:19 +02:00
Alan Plum 0cfa0ed953
foxx.js -> foxx/index.js 2016-04-18 18:00:18 +02:00
Alan Plum 443ebe42f8
Enable applicationContext for legacy apps 2016-04-18 18:00:18 +02:00
Alan Plum 6a217bc9f7
Remove module.context.foxxFilename 2016-04-18 18:00:18 +02:00
Alan Plum 5161c63670
Remove magical Foxx comments 2016-04-18 18:00:18 +02:00
Alan Plum 54f27f51a2
Expose module.context.service 2016-04-18 18:00:18 +02:00
Alan Plum 4140c26d30
Use symbols for internal module props 2016-04-18 18:00:17 +02:00
Alan Plum c7688a72f8
module.requireCache -> module.require.cache 2016-04-18 18:00:17 +02:00
Alan Plum eacf570a39
applicationContext -> module.context 2016-04-18 18:00:17 +02:00
Alan Plum a385738601
Revert "fixed version"
This reverts commit 034eea10b3.
2016-04-18 18:00:17 +02:00
Jan Steemann 8430f1f71c added test case 2016-04-18 17:29:06 +02:00
Jan Steemann 1355618f67 added tests for indexes on "_key", "_from" and "_to" 2016-04-18 17:22:10 +02:00
Jan Steemann 3ec8bd5706 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 17:04:11 +02:00
Jan Steemann e14fd29339 fixed cluster test 2016-04-18 17:04:03 +02:00
hkernbach 26f7898fac Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-18 16:52:11 +02:00
hkernbach 9ecc6c6183 templates, views, scss, router 2016-04-18 16:51:32 +02:00
Jan Steemann 0b07b77cf8 added index tests 2016-04-18 16:50:39 +02:00
hkernbach 9033a36a9f added node update function 2016-04-18 15:23:38 +02:00
Jan Steemann 881f13e13b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:09:50 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
hkernbach 87ca2a1517 node view 2016-04-18 15:00:40 +02:00
hkernbach 2c0e6cc7f4 cluster view, footer view 2016-04-18 14:34:34 +02:00
hkernbach d0b75e8e5c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-18 13:47:26 +02:00
hkernbach ac8c1b11f5 help us view, cluster state 2016-04-18 13:47:02 +02:00
Michael Hackstein 30c1693fd1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-18 13:43:20 +02:00
Michael Hackstein 75015da169 Fixed JSLint 2016-04-18 13:43:09 +02:00
hkernbach dca43f884b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-18 13:22:14 +02:00
hkernbach c43a5358f8 navbar, font 2016-04-18 13:22:06 +02:00
hkernbach c64e289d82 font change, scss 2016-04-18 13:21:28 +02:00
hkernbach 91e7845e6b query view caching bugfix 2016-04-18 13:21:07 +02:00
Michael Hackstein 04f8c0205c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-18 12:44:51 +02:00
Alan Plum 8a9dffd360
Add GraphQL-sync as dependency 2016-04-18 12:42:49 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
hkernbach 704ef41756 html, scss, layout, helpus view 2016-04-18 11:42:28 +02:00
Michael Hackstein 7fd765555a Fixed Cluster Client tests for Babies 2016-04-18 10:04:04 +02:00
Frank Celler b71185c7e9 WIP 2016-04-17 20:49:59 -07:00
jsteemann 30ec73e596 AQL bugfixes and tests, CHANGELOG updates 2016-04-17 20:57:13 +02:00
jsteemann 2294a4287c added tests 2016-04-17 11:31:45 +02:00
jsteemann 1ca9606bbc added tests 2016-04-17 11:21:07 +02:00
jsteemann 43f040b3c5 added test cases 2016-04-17 11:04:46 +02:00
Frank Celler 3a0ea3aecd WIP 2016-04-16 22:21:32 -07:00
Frank Celler de092a3885 single execute only 2016-04-16 21:01:07 -07:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler cf416c686c WIP 2016-04-16 18:44:10 -07:00
Frank Celler 9d26ab1bbc WIP 2016-04-16 17:39:20 -07:00
Frank Celler 040104ebb5 WIP 2016-04-17 00:54:18 +02:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
jsteemann 18f54c2dde Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-15 17:21:35 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Kaveh Vahedipour e3dbb4f9b6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:31:00 +02:00
Kaveh Vahedipour 97a6c29ec6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:29:44 +02:00
Michael Hackstein a4f6844e27 Fixed babies test in error cases. 2016-04-15 15:53:21 +02:00
Michael Hackstein 5645d77d22 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 15:40:04 +02:00
Michael Hackstein 4838eba64e Added a large timeout to upgrade database in test case 2016-04-15 15:39:50 +02:00
Max Neunhoeffer a4a8888e54 Sort out cluster test shutdown. 2016-04-15 15:20:28 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02:00
hkernbach a2f57b2ca8 grunt 2016-04-15 13:49:44 +02:00
hkernbach d6d741a27a images, html 2016-04-15 13:48:16 +02:00
Jan Steemann 65e6aed49f jslint 2016-04-15 12:40:14 +02:00
Michael Hackstein 59f7d1ec70 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 08:25:05 +02:00
Frank Celler 6c0ebb1637 WIP 2016-04-14 21:46:28 -07:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Max Neunhoeffer e68a60f81f Remove a test that is no longer needed. 2016-04-15 00:39:55 +02:00
Max Neunhoeffer ce150a6539 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 00:14:12 +02:00
Max Neunhoeffer cac003a0f4 Take out trace log in testing.js 2016-04-15 00:13:48 +02:00
Max Neunhoeffer 429e59108b Improve situation with tests. 2016-04-15 00:13:37 +02:00
hkernbach cbe91c6df9 scss 2016-04-14 23:49:25 +02:00
hkernbach 0f3997d162 grunt build 2016-04-14 23:44:46 +02:00
hkernbach 8b4f0ed6e8 responsive scss changes 2016-04-14 23:41:24 +02:00
hkernbach c6f82ef3ae new edge api adjustments 2016-04-14 23:41:08 +02:00
hkernbach 06a54b5841 frontend router 2016-04-14 23:14:00 +02:00
hkernbach ff264ea01c scss 2016-04-14 23:13:51 +02:00
Frank Celler b2b5fbb62d WIP 2016-04-14 14:02:07 -07:00
hkernbach e27c6d1554 grunt 2016-04-14 22:53:46 +02:00
hkernbach 5b03dfef1e new collection view + subviews 2016-04-14 22:49:39 +02:00
jsteemann 87c79ca41c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 22:03:32 +02:00
jsteemann ad062b0566 turn off trace-level logging 2016-04-14 22:03:21 +02:00
hkernbach bcaadd878f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 21:56:52 +02:00
hkernbach 5c153730d2 view, subviews, scss 2016-04-14 21:56:43 +02:00
Max Neunhoeffer dab12cbeed Take out a debugging message. 2016-04-14 20:20:56 +02:00
Michael Hackstein 2f5910f828 Removed debug output and deactivated TRACE log level during tests 2016-04-14 20:15:26 +02:00
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Kaveh Vahedipour f9716fee62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 16:41:18 +02:00
Kaveh Vahedipour 393b068ac4 store's operator handling 2016-04-14 16:40:25 +02:00
hkernbach 20c80aa35e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:38:47 +02:00
hkernbach b7e6b5dfca jslint frontend 2016-04-14 15:38:39 +02:00
Andreas Streichardt 3160b3cccb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:30:34 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Kaveh Vahedipour 05db051950 agency test for assigning objects through op set new ttl 2016-04-14 14:34:15 +02:00
hkernbach 128caabd92 scss lint 2016-04-14 13:54:09 +02:00
hkernbach 020c3df628 lib + frontend grunt build 2016-04-14 13:24:18 +02:00
hkernbach 163e58898b Merge remote-tracking branch 'origin/frontendmerge' into devel 2016-04-14 13:08:43 +02:00
hkernbach 526b686cc5 grunt 2016-04-14 13:01:17 +02:00
hkernbach 9d3386cc28 frontend 2016-04-14 13:00:27 +02:00
hkernbach 4ff4729e0f view, scss 2016-04-14 09:43:32 +02:00
Michael Hackstein 4d02abeaa9 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 09:05:56 +02:00
Michael Hackstein 32a5ed5972 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 09:04:34 +02:00
Michael Hackstein bce15b7345 Actually deactivated the agency.wait-for-sync for tests. 2016-04-14 09:04:26 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Andreas Streichardt 0ed24b7465 Merge branch 'agency' into devel 2016-04-13 19:35:30 +02:00
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +02:00
Michael Hackstein 1352e3d682 Fixed JSLINT 2016-04-13 15:57:49 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
hkernbach b9d1712fb0 scss 2016-04-13 15:12:03 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
hkernbach 79a57b9fc8 view, scss, templates 2016-04-13 11:12:55 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
hkernbach 83a385bd74 grunt build 2016-04-12 22:54:47 +02:00
hkernbach e8fd3fb1cb scss style changes 2016-04-12 21:23:00 +02:00
hkernbach b55bac0560 headerbar scss, fixed some view problems caused by backbone update 2016-04-12 18:24:58 +02:00
hkernbach ba147c73bd grunt 2016-04-12 17:00:43 +02:00
hkernbach 9576c3104b nodes view 2016-04-12 17:00:29 +02:00
hkernbach dbe2c17ae5 scss, updated backbone & underscore libs, views 2016-04-12 16:53:24 +02:00
Jan Steemann f2c8df7db7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 14:51:37 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Andreas Streichardt 8354acca0d Merge github.com:arangodb/arangodb into devel 2016-04-12 14:11:22 +02:00
Andreas Streichardt 7b90f3040c parallelize cluster instance startup during test 2016-04-12 14:10:38 +02:00
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +02:00
hkernbach 2e2712b4bf grunt build 2016-04-12 12:35:12 +02:00
hkernbach c819c00c9b views, router 2016-04-12 12:34:46 +02:00
hkernbach 46bd354bd3 dashboard configuration 2016-04-12 12:34:31 +02:00
hkernbach 2f5bb27e4a scss 2016-04-12 12:34:01 +02:00
hkernbach a48b935be6 views 2016-04-12 12:33:47 +02:00
hkernbach be3757ccb6 updated nvd3 + d3 2016-04-12 11:50:10 +02:00
Michael Hackstein 7991815376 Fixed property undefiend bug in test 2016-04-12 10:39:30 +02:00
Michael Hackstein eeb11919f9 Fixed expectation in cluster-crud test. We cannot guarantee that CHANGE_SHARDING_ATTRIBUTES is thrown, might be NOT_FOUND in some cases 2016-04-12 10:35:09 +02:00
Michael Hackstein 0bc206ff80 Further modification of document babies test 2016-04-12 08:51:16 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00
hkernbach 4857c87818 grunt build 2016-04-11 18:38:58 +02:00
hkernbach 15483723b7 added node(s) view(s) 2016-04-11 18:36:33 +02:00
Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 16:33:08 +02:00
Michael Hackstein 5bc4bb51e6 Reactivated babies test in cluster 2016-04-11 16:32:25 +02:00
Michael Hackstein 0ec045d811 Removed debug output 2016-04-11 16:31:41 +02:00
Michael Hackstein 19139a7bf5 Modified document-babies tests. They are now green but correctness has to be discussed. 2016-04-11 16:29:04 +02:00
Wilfried Goesgens 81df4e6e85 migrate 1b41f5c0bb to devel. 2016-04-11 14:21:46 +02:00
Michael Hackstein 7313df2e5f Fixed babies-tests to fit the newest definition 2016-04-11 14:21:34 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
Michael Hackstein 97623706b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 10:09:43 +02:00
Frank Celler 3d2cc31306 WIP 2016-04-11 00:05:37 +02:00
Alan Plum 1aacd670bc Merge pull request #1797 from Simran-B/devel
Add unit tests for TO_BOOL() and unary not with a whole document
2016-04-10 16:35:50 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
Michael Hackstein 68577f1a45 Fixed expectation of document-babies test. Not yet green 2016-04-10 14:09:18 +02:00
Simran Brucherseifer 5905465c26 Add unit tests for TO_BOOL() and unary not with a whole document 2016-04-09 01:55:00 +02:00
jsteemann e84a0ff0ad jslint argl 2016-04-09 01:02:59 +02:00
jsteemann f94f298862 deactivate babies tests temporarily 2016-04-08 23:50:02 +02:00
hkernbach bb60cef7b3 cluster view 2016-04-08 18:31:29 +02:00
hkernbach 7992591501 fixed some routing issue, scss, fixed a graph issue 2016-04-08 17:51:17 +02:00