jsteemann
ade4b411b2
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-07-18 11:44:23 +02:00
jsteemann
b9b01b4c77
always flush log in case of exception
2016-07-18 11:44:14 +02:00
Wilfried Goesgens
49d8a963cd
New example file.
2016-07-18 11:22:53 +02:00
Wilfried Goesgens
53e2e0b4cb
by @servusoft : fix rocksdb cmake compile on ARM by removing unsupported compiler flag.
2016-07-18 11:21:13 +02:00
Wilfried Goesgens
15f1990b57
by @servusoft : use signed char if we want to operate with `-1`
2016-07-18 11:19:43 +02:00
Jan Steemann
dc51d9dea5
issue #1944 : nicer error logging in console.log()
2016-07-18 10:55:52 +02:00
jsteemann
306ea79e18
remove unused script
2016-07-18 10:38:24 +02:00
jsteemann
85f02ddc27
eshint
2016-07-18 10:24:16 +02:00
jsteemann
83a9763cc9
added test for V8 segfault
2016-07-18 10:17:48 +02:00
jsteemann
513d381cc8
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-07-18 09:45:40 +02:00
jsteemann
eaeafcaedd
fixed segfault in V8, by backporting https://bugs.chromium.org/p/v8/issues/detail?id=5033
2016-07-18 09:44:38 +02:00
Jan Christoph Uhde
f2c660627f
Merge branch 'obi-rest-changes' into devel
...
* obi-rest-changes:
virtualize functions of request/response
ignore build.sh
2016-07-16 19:36:01 +00:00
hkernbach
377d556e98
grunt build [ci skip]
2016-07-15 19:21:05 +02:00
hkernbach
34a4d9e5ce
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-07-15 19:16:26 +02:00
hkernbach
11c33882c8
gv settings [ci skip]
2016-07-15 19:16:16 +02:00
Jan Steemann
60bb0f2dde
attempt to fix issue #1943
2016-07-15 17:40:42 +02:00
Wilfried Goesgens
9e06af757c
Add missing documentation of the users database list and the hint that this should be used instead of the database api.
2016-07-15 16:01:19 +02:00
Jan Christoph Uhde
6e9304cdc4
Merge remote-tracking branch 'origin/devel' into obi-rest-changes
...
* origin/devel: (43 commits)
added dev button to graphs view [ci skip]
grunt build [ci skip]
Remove jshint
Mention updating license info
Prevent World War 3
Always use --global-style when installing npm deps
gv - editable & createable nodes, edges [ci skip]
Rebuild aardvark
Make sure Show Interface check asks for HTML
oops, @not supported here.
Fix phrase explaining when the collections are dropped alongside the graph definition.
fixed issue #1941
gv [ci skip]
added test for "fake" _key values
fixed issue #1942
In Farbe und in STEREREOOOUU!
grunt [ci skip]
gv [ci skip]
Fix documentation.
Fix fix.
...
2016-07-15 09:20:04 +00:00
hkernbach
171010bf43
added dev button to graphs view [ci skip]
2016-07-14 23:15:48 +02:00
hkernbach
1ed721c722
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-07-14 21:01:51 +02:00
hkernbach
b9a75b42c0
grunt build [ci skip]
2016-07-14 21:01:42 +02:00
Alan Plum
5f97150d3f
Remove jshint
2016-07-14 16:35:08 +02:00
Alan Plum
ace8699fa4
Mention updating license info
2016-07-14 16:35:08 +02:00
Alan Plum
b570de58d6
Prevent World War 3
2016-07-14 16:29:20 +02:00
Alan Plum
cf302adf26
Always use --global-style when installing npm deps
...
This partially reverts commit 8a286a30d9
.
2016-07-14 16:29:20 +02:00
hkernbach
78e83305bc
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-07-14 15:59:07 +02:00
hkernbach
b22c34753e
gv - editable & createable nodes, edges [ci skip]
2016-07-14 15:57:18 +02:00
Alan Plum
4ea6517275
Rebuild aardvark
2016-07-14 14:44:42 +02:00
Alan Plum
315b2e15f2
Make sure Show Interface check asks for HTML
2016-07-14 14:44:06 +02:00
Wilfried Goesgens
ac4eccee02
oops, @not supported here.
2016-07-14 11:51:53 +02:00
Wilfried Goesgens
532d10300d
Fix phrase explaining when the collections are dropped alongside the graph definition.
2016-07-14 11:28:40 +02:00
Jan Steemann
2441b2f700
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-07-14 10:09:01 +02:00
Jan Steemann
a1c2b7cc63
fixed issue #1941
2016-07-14 10:08:17 +02:00
hkernbach
f79ecfc162
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-07-14 09:37:34 +02:00
hkernbach
d5aa534a80
gv [ci skip]
2016-07-14 09:37:21 +02:00
Jan Steemann
6d856efd4f
added test for "fake" _key values
2016-07-14 09:29:42 +02:00
Jan Christoph Uhde
682cf7a2f1
virtualize functions of request/response
2016-07-14 08:40:05 +02:00
Jan Christoph Uhde
2695b2bea9
ignore build.sh
2016-07-14 08:39:44 +02:00
jsteemann
f5608449b2
fixed issue #1942
2016-07-13 20:32:59 +02:00
Wilfried Goesgens
fe5c742803
In Farbe und in STEREREOOOUU!
2016-07-13 17:12:24 +02:00
hkernbach
39a6e0a73e
grunt [ci skip]
2016-07-13 16:40:03 +02:00
hkernbach
1929b24901
gv [ci skip]
2016-07-13 16:39:56 +02:00
Wilfried Goesgens
08b892f09f
Fix documentation.
2016-07-13 15:19:58 +02:00
Max Neunhoeffer
a78fd42b67
Merge branch 'HLC' into devel
2016-07-13 12:52:33 +02:00
Max Neunhoeffer
4202b817ed
Fix fix.
2016-07-13 12:22:00 +02:00
Max Neunhoeffer
3df0d2dc32
Fix bug in HybridLogicalClock.
2016-07-13 12:21:17 +02:00
Jan Christoph Uhde
03e89265fd
Merge branch 'devel' of github.com:arangodb/arangodb into obi-merge-restserver
...
* 'devel' of github.com:arangodb/arangodb:
updated CHANGELOG
fixed array index batch insertion issue
Fix syntax errors in user auth documentation
fix grammer.
prevent compile warning
2016-07-13 11:35:16 +02:00
Jan Steemann
6022456e89
updated CHANGELOG
2016-07-13 11:33:05 +02:00
Jan Steemann
6b7defc737
fixed array index batch insertion issue
2016-07-13 11:32:39 +02:00
Wilfried Goesgens
cbe634a0e6
Fix syntax errors in user auth documentation
2016-07-13 11:24:20 +02:00