1
0
Fork 0
Commit Graph

2915 Commits

Author SHA1 Message Date
baslr f669fd4b9e LDAP: more options 2017-03-30 11:03:13 +02:00
baslr 3b2ccf46f4 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-30 01:55:08 +02:00
mpv1989 e763233ca7 Foxx: Fix arangoUser not being set correctly 2017-03-29 17:33:16 +02:00
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
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
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 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