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

2965 Commits

Author SHA1 Message Date
baslr 0713099acc Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:13:24 +02:00
mpv1989 59e000b743 Foxx: Fix CORS blowing up when headers are not set 2017-03-29 13:43:06 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
baslr 7f92c26774 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 00:29:16 +02:00
mpv1989 f3ebf247b0 automatically add CORS response headers 2017-03-28 19:48:46 +02:00
Jan Christoph Uhde f4e164ef78 fix compile errors 2017-03-27 08:57:51 +02:00
baslr fef40e3c9d merge with devel 2017-03-24 12:07:29 +01:00
baslr e78da3d85f LDAP: added additional errors 2017-03-23 23:51:48 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann 6cbe5e7776 fix message 2017-03-23 19:41:28 +01:00
baslr 71b22e642f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-23 13:36:12 +01:00
baslr 8c2b951884 LDAP: additional error codes 2017-03-23 01:26:51 +01:00
Wilfried Goesgens 85f58b9a21 we may now also do 'milestone'-releases next to devel/alpha/beta/rc 2017-03-22 11:59:25 +01:00
baslr 8fa6f9c5e7 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-21 23:27:26 +01:00
Dan Larkin 6cedc0ba53 Merge branch 'views' into devel 2017-03-21 11:40:42 -04:00
Dan Larkin 85132e0eaf Finished adding view support to ArangoShell. 2017-03-21 11:40:14 -04:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
baslr f593561438 introduce LDAP errors 2017-03-20 16:14:29 +01:00
Dan Larkin a80ed16477 Added basic views support to ArangoShell. 2017-03-18 16:35:51 -04:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
Alan Plum 97e80c9d3b
Whitespace 2017-03-16 15:45:45 +01:00
Alan Plum 50e0eb16d2
Use COLOR_OUTPUT to determine whether to use color 2017-03-15 20:44:03 +01:00
Alan Plum 4920ef8b41
Implement tap/xunit reporters in Foxx 2017-03-15 20:09:31 +01:00
Alan Plum c18aa323dc
Extract util.indentation 2017-03-15 20:09:30 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
jsteemann bda65cef8b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 10:33:25 +01:00
jsteemann aa870e9bce fix attribute name parser failure return code 2017-03-07 10:32:27 +01:00
jsteemann 644ef08ce0 added "bindVars" to attributes of currently running and slow queries 2017-03-07 00:19:01 +01:00
jsteemann c2d7412cb3 removed unused files 2017-03-06 17:41:30 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
Simon Grätzer e94cb25c92 Editing documentation and moving test 2017-03-03 23:29:23 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
jsteemann 3a39921147 fixed documentation and added tests for grants API 2017-03-03 12:33:13 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 14d5898fc2 test for issue #2342 2017-03-02 13:53:17 +01:00
jsteemann 7017c4747d change default string truncation length 
from 80 characters to 256 characters for `print`/`printShell` functions in ArangoShell and arangod.
this will emit longer prefixes of string values before truncating them with `...`, which is helpful for debugging.
 2017-03-02 09:52:43 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
Alan Plum d72f3ea511
Define Foxx's expected routing behaviour 2017-02-14 16:36:40 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
 2017-02-10 15:21:24 +01:00
Michael Hackstein d999ebfa87 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-10 12:59:06 +01:00
jsteemann 3c2edd46cd some diagnostics if tasks are not found 2017-02-10 12:27:43 +01:00
Frank Celler dc5e946c05 version number is now generated 2017-02-09 16:35:10 +01:00
jsteemann bb32f2741e added tests 2017-02-08 12:53:02 +01:00
Simon Grätzer 58ec9033f4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-02 23:15:34 +01:00
Frank Celler ca28e7c978 added support for topic logging 2017-02-02 16:00:37 +01:00
Simon Grätzer cec711bc85 Fixed test 2017-01-31 14:13:58 +01:00
Simon Grätzer 37243315e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 15:30:28 +01:00
Frank Celler 864bd451cf wait longer for figures 2017-01-28 00:25:30 +01:00
Simon Grätzer 64343cd579 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2017-01-27 15:58:22 +01:00
Alan Plum c9b926916a
Even cleaner SyntaxError stacktraces 
Don't clutter stacktraces for Node compatibility at all. Just add lineNumber/columnNumber/fileName to the object.
These are non-standard but there is precedent for these names in Mozilla.
 2017-01-27 05:53:39 +01:00
Alan Plum 88ac5777d6
Clean up SyntaxError generation 
Clobber stacktrace instead of wrapping in another exception with wonky message string.
This makes SyntaxError details node-compatible and parseable for generating code frames.
 2017-01-27 05:34:22 +01:00
Alan Plum 3370ecbadd
Nicer error page and code frames 2017-01-27 01:57:30 +01:00
Alan Plum c268b2db91
Keep stacktraces out of error messages 
They are already reported much more consistently via 'cause' so methods logging them should exploit that instead.
 2017-01-27 01:57:29 +01:00
Simon Grätzer 4c370a09fe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Cluster/ClusterInfo.h
 2017-01-24 16:41:34 +01:00
Andreas Streichardt 7b1c9b7833 Instanceinfo and testresult will now be written to the test rootdir 2017-01-24 14:54:10 +01:00
Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:42:19 +01:00
Andreas Streichardt 9ad10acdc0 add mochagrep 2017-01-19 17:58:43 +01:00
Simon Grätzer 54da6971f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 14:07:13 +01:00
jsteemann c9a2c028fa emit sort registers for GatherNode in explain output 2017-01-18 11:58:31 +01:00
Kaveh Vahedipour ea7e16979a agency bug in precondition and log handling fixed 2017-01-18 11:07:30 +01:00
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00
Andreas Streichardt 4458f04e46 More specific error codes for the cluster 2017-01-11 17:54:45 +01:00
Simon Grätzer 9c9d0a6a20 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 16:30:32 +01:00
Michael Hackstein 0365363090 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 15:39:12 +01:00
Michael Hackstein fe7a829592 trx crud with empty arrays now short-circuit and return success with empty array. This lead to errors in cluster, band now is consistent with single-server. 2017-01-10 15:15:15 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
 2017-01-09 13:34:37 +01:00
jsteemann 503326852c try to fix test for MacOS 2017-01-09 10:58:58 +01:00
jsteemann ef76ab38cc fixed test 2017-01-06 15:29:01 +01:00
Wilfried Goesgens 19b8c90bcb fix examples - reset collections cache when working with the graph api 
- add dummy cache flush function into the arangod db object
 - call cache flush when creating and deleting graphs
 2017-01-04 14:34:26 +01:00
jsteemann b8a64ccca2 attempt to fix hanging tests 2017-01-03 15:53:52 +01:00
Simon Grätzer 431df0c5a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 11:56:44 +01:00
jsteemann 8e8e064429 fix jslint for crypto file 2016-12-20 08:50:44 +01:00
Simon Grätzer f1b6170e96 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 10:17:18 +01:00
Alan Plum e0fe78b782
Implement HOTP/TOTP 2016-12-19 02:20:53 +01:00
Alan Plum 61301a391b
Expose PKCS5_PBKDF2_HMAC to JS 2016-12-19 02:20:51 +01:00
Alan Plum 9a347f74fa
Cleanup crypto.js 2016-12-19 02:20:29 +01:00
Simon Grätzer e4951835aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-14 10:40:03 +01:00
jsteemann 4d76ef962b added count(details = true) for sharded collections 2016-12-13 16:03:49 +01:00
jsteemann 03acaaea47 fixed issue #2217 2016-12-13 14:19:55 +01:00
Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2016-12-09 14:30:19 +01:00
Andreas Streichardt 82682f8d25 Wait for synchronous replication to settle 2016-12-07 18:38:15 +01:00
Alan Plum 0700cfa86a
Implement OAuth 1.0a 2016-12-06 18:30:11 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Simon Grätzer b126e1dddb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-06 14:57:09 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00
Simon Grätzer 3142cc1505 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-05 01:19:56 +01:00
jsteemann 2aa414f731 fixed issue #2204 2016-12-02 13:59:48 +01:00
jsteemann 2521dff57c fix error message returned by arangoimp in case of some secondary unique key constaint violations 2016-12-02 13:37:17 +01:00
jsteemann dc5384609c jslint 2016-12-01 14:39:28 +01:00
Simon Grätzer 34714f8743 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-01 14:11:14 +01:00
Michael Hackstein 0f119172dd Added convenience function to create vertexCentric indexes. 2016-11-29 12:31:25 +01:00
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Michael Hackstein 0786eb735f Fixed passing of unique when using createHashIndex() 2016-11-25 16:08:58 +01:00
Michael Hackstein 7c96010711 Reincluded ensureGeoConstraint. Somehow got lost in my last commit. 2016-11-25 12:58:48 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +01:00
Michael Hackstein 37b124593f Unified ensureIndex on client and server libs. 2016-11-25 11:11:45 +01:00