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

10971 Commits

Author SHA1 Message Date
hkernbach 65394e6390 grunt 2016-04-22 12:36:53 +02:00
hkernbach 67420663ed views 2016-04-22 12:33:13 +02:00
hkernbach 5aa9481bd0 templates 2016-04-22 12:32:37 +02:00
hkernbach 81aacb7c52 scss 2016-04-22 12:32:27 +02:00
hkernbach 9c9f18deec graph viewer bugdix, navigation, scss 2016-04-22 09:14:42 +02:00
hkernbach 2c600544d6 grunt build 2016-04-21 18:53:48 +02:00
hkernbach 2ff6aa39b1 frontend images 2016-04-21 18:53:36 +02:00
hkernbach ed50faa950 login view 2016-04-21 18:49:40 +02:00
hkernbach c5ee12019a scss 2016-04-21 16:44:56 +02:00
hkernbach 9ddd8ed0a5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 15:20:24 +02:00
hkernbach abe9880da7 grunt 2016-04-21 15:20:17 +02:00
hkernbach 1d611d0dd2 scss-lint 2016-04-21 15:17:02 +02:00
Alan Plum 7653fe5eb8
Re-createSid on every access 
There's no other way to prevent the internal sid from timing out apparently.
 2016-04-21 15:14:01 +02:00
hkernbach ae574ee85c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 15:11:39 +02:00
hkernbach 62370bfba8 scss 2016-04-21 15:11:31 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 5027d7fe1f documentation for LIKE 2016-04-21 12:46:42 +02:00
hkernbach 98d89f6ac3 scss 2016-04-21 12:33:48 +02:00
Kaveh Vahedipour 1acb0cba6f agency/cluster startups seem correct 2016-04-21 11:19:07 +02:00
hkernbach 5917b77cb5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 10:58:24 +02:00
hkernbach 13dc4e3637 footer, grunt config, dygraph config, navbar, dashboard 2016-04-21 10:58:16 +02:00
Alan Plum 996c4568fb
Fix shell-foxx-swager-spec.js 2016-04-21 10:10:11 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections 
Excluded Aardvark, the graph viewer in particular
 2016-04-20 22:09:00 +02:00
Alan Plum e7e457b560
ES6ify 2016-04-20 18:34:46 +02:00
Alan Plum a3d5c64532
Object.extend is not a function 2016-04-20 18:13:04 +02:00
Alan Plum e4cfa5ec0d
Throw better errors when install fails 2016-04-20 18:11:49 +02:00
Alan Plum 0529471cdc
Allow passing an error to res.throw as reason 2016-04-20 18:11:49 +02:00
hkernbach 05578e8fbf files not needed 2016-04-20 18:11:05 +02:00
hkernbach 8ed6f3bb49 scss cleanup tiles 2016-04-20 18:08:05 +02:00
hkernbach 346363b8b8 fixed tiles 2016-04-20 18:07:52 +02:00
hkernbach 23e21904be grunt 2016-04-20 17:40:28 +02:00
hkernbach 5cde3c698d grunt 2016-04-20 17:34:50 +02:00
hkernbach 5331c317dd grunt build 2016-04-20 17:28:55 +02:00
hkernbach 4d7a1d2b2e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 17:26:54 +02:00
hkernbach e27fa8ae38 new login mechanism, additional frontend changes 2016-04-20 17:26:44 +02:00
Max Neunhoeffer 13fdd67d38 Better timeouts in synchronisation in heartbeat thread. 2016-04-20 17:24:38 +02:00
Max Neunhoeffer e49893cef8 Prepare testing of synchronous replication. 2016-04-20 17:24:19 +02:00
Alan Plum 96aa1d9129
Add req.json 2016-04-20 17:18:51 +02:00
Alan Plum 7065d29975
Don't add default bodies 2016-04-20 17:18:51 +02:00
Alan Plum eea0a0e259
Deduplicate AQL template bindVars and support AQB 2016-04-20 16:18:19 +02:00
hkernbach 972367b4f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 15:48:21 +02:00
hkernbach 5b7f5114f4 cleaned up grunt build 2016-04-20 15:48:11 +02:00
hkernbach fed6c3602c cleanup grunt build process 2016-04-20 15:47:35 +02:00
Alan Plum ac29066808
Make aql global in arangosh 2016-04-20 15:23:05 +02:00
Alan Plum 2f2c7b5c12
Allow switching databases in login 2016-04-20 15:23:04 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 0fff3e661f
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 249dddcdf4
Optionally auto-update collection sessions 2016-04-20 15:23:02 +02:00
Alan Plum e7c0a49cfb
Don't use session.userData in system, always update lastAccess 2016-04-20 15:23:01 +02:00
Alan Plum c23d73f78c
Aardvark should always expect auth 2016-04-20 15:23:01 +02:00
Alan Plum 50ae4804f6
Spacing 2016-04-20 15:23:00 +02:00
hkernbach cb8413f174 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 13:57:27 +02:00
hkernbach c6caacc474 modified grunt build 2016-04-20 13:56:45 +02:00
Alan Plum 95b9f8db7e
Nevermind that 2016-04-20 13:45:17 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
hkernbach 2a8f73593a navigation view 2016-04-20 12:54:43 +02:00
hkernbach e6a9ea7cab disabled dashboard when statistics are not available 2016-04-20 12:54:31 +02:00
hkernbach 78975ceaef dashboard scss 2016-04-20 12:52:50 +02:00
hkernbach ad0f86723a scss dashboard + dropdowns 2016-04-20 12:47:58 +02:00
hkernbach 90bd28f5fb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 12:29:20 +02:00
hkernbach 54c8d4c700 foxx teardown route fix 2016-04-20 12:29:07 +02:00
jsteemann 9d258f47e0 added test case 2016-04-20 12:26:07 +02:00
hkernbach 2d4409e376 aardvark explain route 2016-04-20 12:06:40 +02:00
jsteemann e390da31c1 speed up test 2016-04-20 10:27:06 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 69b5442181
Rebuild aardvark 2016-04-19 20:18:24 +02:00
Alan Plum 2094d1adca
Unbreaky dashboard floats 2016-04-19 20:17:34 +02:00
Alan Plum 2d44ff2839
Patch Swagger-UI to fix param.type undefined error 
See https://github.com/swagger-api/swagger-ui/issues/2004
 2016-04-19 18:39:22 +02:00
Jan Steemann 76fa336a3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:19:21 +02:00
Jan Steemann 34923ff236 added "enabled" flag for statistics output 2016-04-19 18:19:07 +02:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt f7a0b10a69 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:11:35 +02:00
Andreas Streichardt 95a6540c2e Fix core dump windows stuff 2016-04-19 18:11:18 +02:00
hkernbach 75df0f56f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:02:08 +02:00
hkernbach 96d2348199 frontend, views, navbar 2016-04-19 18:01:31 +02:00
Michael Hackstein 95662103f2 Fixed JSLint 2016-04-19 17:39:58 +02:00
Michael Hackstein 1eb1e0ee0c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:08:21 +02:00
Michael Hackstein 2c246c860c Fixed a bug in general-graph module. It was possible to create a graph using document collections for relations. This did lead into undefined behaviour. 2016-04-19 17:07:18 +02:00
hkernbach 3d94293e3c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:33:28 +02:00
hkernbach bcbaa7bc72 modified nodes view 2016-04-19 16:33:17 +02:00
Alan Plum 8373c04c1a
Just no 2016-04-19 16:18:18 +02:00
Alan Plum 64289b3895
I Shall Exterminate Everything Around Me 2016-04-19 16:12:19 +02:00
hkernbach 9ac9331072 nodes view 2016-04-19 16:05:29 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
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