hkernbach
f647212224
merge
2015-10-30 10:20:00 +01:00
hkernbach
4940c80d88
optimized notifications, removed bug in document editor, css fixes
2015-10-30 10:17:53 +01:00
Jan Steemann
10612184ee
added derived file
2015-10-30 10:12:34 +01:00
Michael Hackstein
c3a6de0cc4
Added more CXX tests for AQL numeric functions
2015-10-30 10:00:25 +01:00
Michael Hackstein
5a97b2c8bb
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-30 09:25:28 +01:00
Frank Celler
55e940c1cd
reverted 2070d7bd47
because of missing cla
2015-10-29 20:02:39 +01:00
Frank Celler
901f68f28a
reverted 0692264fe2
, cbe78e3b1f
, 61d3846356
, e26c2295fb
, 6bc34aa8ce
, c0e9db0769
because of missing CLA
2015-10-29 19:59:43 +01:00
Michael Hackstein
6d2e36cee3
Added a test for CXX version of RAND
2015-10-29 16:31:35 +01:00
Wilfried Goesgens
bb9039c855
Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
2015-10-29 16:01:01 +01:00
Michael Hackstein
cc35fdb7b0
Added the implementation and more tests for EDGES in CXX only
2015-10-29 15:52:46 +01:00
Michael Hackstein
69d9cce680
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-29 15:44:49 +01:00
Jan Steemann
581521949e
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-10-29 11:57:34 +01:00
Jan Steemann
01499dde43
added deadlock detection for lazy locking of collections
2015-10-29 11:57:22 +01:00
Michael Hackstein
78e0b4aa9b
Added tests for CXX implementation of EDGES
2015-10-29 10:32:10 +01:00
Michael Hackstein
6552c73d25
Added a CXX implementation of DOCUMENT
2015-10-29 09:50:40 +01:00
Michael Hackstein
293bdf4458
Implemented a CXX version of MINUS
2015-10-28 17:29:51 +01:00
Michael Hackstein
94658bb8da
Added tests for CXX version of MINUS
2015-10-28 16:33:55 +01:00
Michael Hackstein
d8d37a3bd5
Added a CXX implementation for PARSE_IDENTIFER
2015-10-28 16:02:15 +01:00
Michael Hackstein
66ae927e3c
Added a CXX implementation of ZIP. Made the CXX implementation of FLATTEN more relaxed. It now works with invalid maxDepth entries and falls-back to 1 there
2015-10-28 15:06:22 +01:00
Michael Hackstein
9e98d5b87b
Added CXX implementation of FLATTEN incl tests.
2015-10-28 14:10:03 +01:00
Wilfried Goesgens
327b408a22
Start implementing early filtering of paths to exclude from the result
2015-10-28 12:37:13 +01:00
Wilfried Goesgens
951165ab1e
Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
...
Conflicts:
arangod/Aql/grammar.cpp
arangod/Aql/grammar.h
js/common/modules/org/arangodb/graph-examples/example-graph.js
2015-10-28 11:08:18 +01:00
jsteemann
5fff134c80
added CXX implementations of `WITHIN` and `NEAR` AQL functions
2015-10-27 23:24:00 +01:00
Alan Plum
131da2ea97
Workaround for missing root props on Foxx apps
...
Fixes #1547 .
2015-10-27 18:37:22 +01:00
Alan Plum
5370213d03
Add root property to FoxxService JSON
...
See #1547 .
2015-10-27 18:31:44 +01:00
Michael Hackstein
476d4e78fd
Fixed array index test. It is now adapted to new definition of sparse
2015-10-27 17:58:53 +01:00
Michael Hackstein
44001e8049
Removed debug output from foxx manager
2015-10-27 16:34:25 +01:00
Michael Hackstein
7458e6ee75
Fixed cluster tests for array indexing
2015-10-27 15:31:40 +01:00
Michael Hackstein
58cd64639b
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-27 14:19:14 +01:00
Michael Hackstein
a94eb7fd49
In an array index with subattributes the document will be indexed with null if it has the array, but the subattribute is not existing. And it will not be indexed if it does not have the array
2015-10-27 14:19:06 +01:00
hkernbach
9a25bc2783
edited graph edit modal, js+css
2015-10-27 13:58:44 +01:00
Michael Hackstein
d7f3ca496d
The Array Index now allows to query for null IN in sparse version
2015-10-27 13:00:49 +01:00
Michael Hackstein
52e372ab27
Added some more Array Indexing tests. And improved the pathbased index. Now it is checked when trying to array-index a non-array value. And if non existing attributes are added to the index or not.
2015-10-27 11:14:02 +01:00
Michael Hackstein
817c9827e1
Added tests for Array-Indexing non Array elements. It should allow partial indexing in the skiplist and forbid indexing in the hash index now.
2015-10-26 17:22:01 +01:00
Michael Hackstein
deac579950
Added tests for Indexing non-Array elements with an Array Index
2015-10-26 11:57:53 +01:00
Michael Hackstein
c35ccc02d5
Fixed unique-constrain-violated behaviour in SkiplistIndex
2015-10-26 09:28:14 +01:00
Jan Steemann
3cf1b237ee
dfdb improvements
2015-10-23 19:03:24 +02:00
Jan Steemann
3c4849e81a
only drop known graphs
2015-10-23 19:03:11 +02:00
hkernbach
ea6903ee33
issue #1537 : from and to vertices always visible
2015-10-23 18:53:59 +02:00
hkernbach
a4bdf8d38c
grunt build
2015-10-23 18:27:13 +02:00
hkernbach
7caac2edae
webui: added some cursors to indicate actions
2015-10-23 18:24:46 +02:00
Jan Steemann
ad068ce49f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-10-23 17:23:11 +02:00
Max Neunhoeffer
e6a81de395
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2015-10-23 16:45:37 +02:00
Max Neunhoeffer
cc45a0d352
Implement role switching.
2015-10-23 16:45:21 +02:00
Jan Steemann
025e470e3b
added a single-array parameter variant for the AQL MERGE function
2015-10-23 15:29:53 +02:00
Jan Steemann
afc3de16ed
re-grunted
2015-10-23 14:03:08 +02:00
Jan Steemann
731fb9e1c5
moved frontend files
2015-10-23 14:02:08 +02:00
Jan Steemann
2bfcfcadfa
removed duplicate target from Makefile
2015-10-23 13:41:09 +02:00
Jan Steemann
606213c1e2
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-10-23 12:54:47 +02:00
Jan Steemann
f457f3c89a
remove unuseful test
2015-10-23 12:54:34 +02:00
Michael Hackstein
d478f8dcc9
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-23 12:50:02 +02:00
Michael Hackstein
0a175a4271
Removed getOne in SimpleAttribute Matcher. All of the attributes are in sorted order rendering getOne and getAny useless
2015-10-23 12:49:57 +02:00
Jan Steemann
e2136ea21a
do not allow index creation with multiple [*] in single attribute
2015-10-23 11:45:17 +02:00
Michael Hackstein
c4b0b21c74
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-22 17:13:18 +02:00
Michael Hackstein
efd0ba0618
Removed a test for nested array indexes. We still need a decission there
2015-10-22 17:13:07 +02:00
Michael Hackstein
b18d947492
Fixed jslint
2015-10-22 17:04:16 +02:00
Jan Steemann
5a190d1110
fixed leaks, index speedup
2015-10-22 17:03:05 +02:00
Michael Hackstein
4fb37846a4
Deactivated nested array index test
2015-10-22 17:00:39 +02:00
Wilfried Goesgens
e9928de21b
start to fix graph implementation for explain()
2015-10-22 13:05:13 +02:00
Michael Hackstein
7ea4130103
Fixed array indexing if the attribute is not set
2015-10-22 12:13:47 +02:00
Michael Hackstein
d6e2e69fb0
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-22 11:50:44 +02:00
Michael Hackstein
0a79440634
Fixed sparse array index test. It was requested with null and expected an result...
2015-10-22 11:50:38 +02:00
Jan Steemann
caf57a440c
added tests
2015-10-22 11:41:36 +02:00
Michael Hackstein
2d02c7a9f8
Fixed sparse array index test. It was requested with null and expected an result...
2015-10-22 09:43:19 +02:00
Michael Hackstein
f57e6ede36
Added AQL Array Index Or test
2015-10-21 17:49:52 +02:00
Michael Hackstein
f083fc3b66
Added AQL failure tests for EdgeIndex and PrimaryIndex
2015-10-21 16:29:14 +02:00
Michael Hackstein
fe455671d4
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-21 16:20:44 +02:00
Jan Steemann
e187ca26ec
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-10-21 16:14:27 +02:00
Jan Steemann
becac4b4b1
documentation fixes
2015-10-21 16:14:21 +02:00
Alan Plum
4eec43fb28
JSONSchema is so much fun
2015-10-21 16:13:55 +02:00
Michael Hackstein
383912a221
Added failure tests for SimpleAttributeEqualityMatcher
2015-10-21 15:16:55 +02:00
Michael Hackstein
e828984837
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-21 15:05:53 +02:00
Michael Hackstein
afa7f8a2e3
Added failure tests for HashIndex. Now start with AttributeEqualityMatcher.
2015-10-21 15:00:58 +02:00
Jan Steemann
0d2197e77f
changed documentation for index creation methods
2015-10-21 14:59:45 +02:00
Wilfried Goesgens
dae95de667
Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
2015-10-21 14:54:01 +02:00
Wilfried Goesgens
7c3de62b08
Add file name here too - since some log messages will not add it and leave the user in the dark.
...
Also add the hint that we don't support APP-relative paths anymore.
2015-10-21 13:58:36 +02:00
Michael Hackstein
9a58955208
Added failure tests for SkiplistIndex
2015-10-21 13:57:00 +02:00
Alan Plum
13a69a4509
Linting
2015-10-21 13:43:24 +02:00
Jan Steemann
4edc3d11f5
re-grunted
2015-10-21 13:07:30 +02:00
Jan Steemann
74edccbcde
Merge branch 'aql-jmmh-conditions' of https://github.com/arangodb/arangodb into devel
2015-10-21 12:56:51 +02:00
Michael Hackstein
e13ddcf7b2
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-21 12:55:16 +02:00
Michael Hackstein
7fb4679fb2
Added some failure tests for the IndexNode, ConditionFinder. Todo Index tests
2015-10-21 12:54:25 +02:00
Jan Steemann
6b67ea7fd9
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-10-21 12:53:01 +02:00
Jan Steemann
3396214a63
added db._explain() convenience function
2015-10-21 12:52:40 +02:00
Alan Plum
f0e4b027e0
Fix swagger JSON to pass validation
2015-10-21 12:07:33 +02:00
Alan Plum
28edf6cb66
Fix generated service require paths
2015-10-21 12:07:14 +02:00
Jan Steemann
509ab83ed5
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-21 10:18:16 +02:00
Jan Steemann
6791dd2936
fixed cluster tests
2015-10-21 10:17:39 +02:00
Alan Plum
f40cb79040
Fix internal session storage lastAccess for non-system apps
2015-10-20 19:29:20 +02:00
hkernbach
179ecd341b
added html cluster min files
2015-10-20 18:14:07 +02:00
hkernbach
86e4bf1a3a
added missing cluster minify option
2015-10-20 18:13:16 +02:00
hkernbach
2191a89f6f
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-20 17:06:40 +02:00
hkernbach
74bca104e5
issue: 1515, fixed 2 and changed text
2015-10-20 17:03:59 +02:00
Michael Hackstein
f181f62b9d
Fixed usage of IN operator
2015-10-20 15:54:38 +02:00
Michael Hackstein
4018071699
Further tests for aql-queries with array indexes. Right now they fail, array index is used although it cannot actually serve
2015-10-20 15:12:03 +02:00
Michael Hackstein
2ecf67780b
Started adding tests for Array Indexes.
2015-10-20 14:33:44 +02:00
Jan Steemann
813048592e
fixed scss building
2015-10-20 12:50:15 +02:00
Jan Steemann
1f8b5e54af
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-20 12:34:33 +02:00
hkernbach
84b32587f5
issue: #1509 , temp. disabled gv outbound connections
2015-10-20 10:57:28 +02:00
Michael Hackstein
17383430d3
Fixed jslint
2015-10-20 09:39:22 +02:00
Michael Hackstein
cbd403bade
Fixed indexes multi tests
2015-10-20 09:29:48 +02:00
Michael Hackstein
ca2c283ab8
Removed debug output in tests
2015-10-20 09:16:34 +02:00
Michael Hackstein
6adfdbe48e
Fixed optimizer indexes-in-or test. In the new IndexNode we need to keep the sort node in some queries
2015-10-20 09:15:34 +02:00
Jan Steemann
d6cad3bac6
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-19 18:55:36 +02:00
Michael Hackstein
8e2d857ba9
Fixed indexes-sort tests
2015-10-19 17:27:53 +02:00
Michael Hackstein
e439407dd4
Fixed tests in optimizer-indexes-in-or. We might be able to optimize a bit more here.
2015-10-19 17:13:03 +02:00
Michael Hackstein
cc836b554b
Fixed optimizer-in-noncluster tests
2015-10-19 16:59:41 +02:00
Wilfried Goesgens
30be20224e
Fix fluent AQL interface for fromVertices with arrays: need to use 'ArrayVariable [ * RETURN MERGE(CURRENT, other)]' instead of MERGE(ArrayVariable, other)
2015-10-19 16:40:39 +02:00
Michael Hackstein
72283203b8
Further adaption of IdnexNode tests. Added manual sort where Sorting is not guaranteed.
2015-10-19 12:30:15 +02:00
Michael Hackstein
251e365b5b
Fixed several sorting tests. The IndexNode does not guarantiee sort order anymore
2015-10-19 11:57:13 +02:00
Michael Hackstein
fc0be76a8f
The ordering in IndexNode is not guaranteed anymore in IN for now. Remved the check from tests
2015-10-19 11:31:58 +02:00
Jan Steemann
e5761736d4
fixed usage of sparse indexes
2015-10-19 10:56:30 +02:00
Michael Hackstein
b7ed2c85b7
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-17 08:37:29 +02:00
jsteemann
82b3acdf17
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-16 22:50:32 +02:00
hkernbach
6005d3098e
frontend cleanup & grunt build
2015-10-16 19:34:54 +02:00
hkernbach
557c1952aa
removed not needed templates
2015-10-16 16:54:39 +02:00
hkernbach
0225c4d982
grunt cleanup & optimization
2015-10-16 13:47:03 +02:00
Michael Hackstein
2137089369
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-16 10:54:18 +02:00
Max Neunhoeffer
024994e3df
Add some interval tests.
2015-10-15 19:04:57 +02:00
Michael Hackstein
dd93460318
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-15 16:20:09 +02:00
Michael Hackstein
06b7d1668a
Fixed tests where we can now use indexes other than before 2.7
2015-10-15 16:20:04 +02:00
Max Neunhoeffer
4728dd10d5
Merge branch 'aql-jmmh-conditions' of ssh://github.com/ArangoDB/ArangoDB into aql-jmmh-conditions
2015-10-15 15:37:17 +02:00
Max Neunhoeffer
0087c24db2
Remove some trailing whitespace on some lines.
2015-10-15 15:36:51 +02:00
Max Neunhoeffer
fc5e9a5640
Add tests for usage of multiple indexes.
2015-10-15 15:33:26 +02:00
Michael Hackstein
136e375b22
Fixed remove filter covered by index test. And fixed a bug in SkiplistIndexIterator where Nullptr could happen but was not expected
2015-10-15 15:27:35 +02:00
Michael Hackstein
50878b0b41
Fixed the use-index-range test
2015-10-15 14:40:01 +02:00
Michael Hackstein
ac351b4141
Another IndexNode test file is executed successfully now
2015-10-15 11:37:38 +02:00
Michael Hackstein
f712aee640
Started to remove references to ranges. Still this test throws internal errors
2015-10-14 16:05:00 +02:00
Michael Hackstein
ed5c759cd3
Removed debug output in test
2015-10-14 14:10:26 +02:00
Michael Hackstein
7378d386ac
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-14 13:11:04 +02:00
Jan Steemann
0ffb11c25e
do not use sparse indexes for sorting
2015-10-14 12:03:52 +02:00
Michael Hackstein
9367624f57
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-14 11:22:13 +02:00
Michael Hackstein
cc96b6e426
Adaption of Indexes Ranges test
2015-10-14 11:21:08 +02:00
Michael Hackstein
31cf31f7b7
Fixed further AQL optimizer tests. Still some issues in new IndexNode
2015-10-14 11:02:52 +02:00
Michael Hackstein
9d7024b28d
Further fixes in AQL optimizer indexes test. It tests now as expected. Some minor issues in IndexNode are still open (Sorting for non-overlapping intervals. Propagation of conditions to earlier EnumerateCollectionNodes
2015-10-14 10:35:28 +02:00
Jan Steemann
8f150e942e
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
...
Conflicts:
CHANGELOG
2015-10-14 09:57:24 +02:00
Michael Hackstein
e988c0052b
Started fixing Optimizer tests, they are supposed to use IndexNode instead of IndexRangeNode now
2015-10-14 09:49:08 +02:00
hkernbach
3f4e6cb982
grunt build
2015-10-14 00:42:30 +02:00
hkernbach
81df6ddda1
cleanup web interface
2015-10-14 00:36:05 +02:00
Michael Hackstein
3846c037da
Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions
2015-10-13 16:27:01 +02:00
Jan Steemann
fcdd95d7cd
fixes
2015-10-13 16:26:43 +02:00
Michael Hackstein
d2e3f7c7c7
Disabled AQL sort rule failure tests
2015-10-13 10:39:43 +02:00
Michael Hackstein
9450e43fda
Splitted a large aql-optimizer test file
2015-10-13 10:11:10 +02:00
Michael Hackstein
fe5a9ddb93
Replaced IndexRangeNode by IndexNode in tests
2015-10-13 09:56:56 +02:00
Michael Hackstein
356cc4306f
Activated use-indexes instead of use-index-range in test
2015-10-13 09:35:18 +02:00
Michael Hackstein
c8210551d7
Fixed edges-noncluster test
2015-10-13 09:34:45 +02:00
Jan Steemann
bb0051b739
fixed hard-coded `incremental` parameter in shell implementation of `syncCollection` function in replication module
2015-10-13 09:33:15 +02:00
jsteemann
29b3741156
reworked cost calculations
2015-10-12 22:23:03 +02:00
Jan Steemann
1f4c775a02
print names of files with failing tests
2015-10-12 17:57:27 +02:00
Michael Hackstein
7821dbcec7
Deactivated use-index-range rule in tests. Activated use-indexes rule instead
2015-10-12 17:47:00 +02:00
Jan Steemann
ffa777979c
make IN values unique and sort em
2015-10-12 15:34:41 +02:00
Jan Steemann
8c6d284cc3
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-09 16:17:18 +02:00
Jan Steemann
e49064e5c4
hide `fm` variable in web interface shell
2015-10-09 15:25:56 +02:00
Frank Celler
2410437bdc
be less verbose
2015-10-09 14:40:21 +02:00
Jan Steemann
e71dde08b7
added derived files
2015-10-09 14:28:02 +02:00
Jan Steemann
23ae3a9693
fixes for front end
...
Conflicts:
js/apps/system/_admin/aardvark/APP/GruntFile.js
2015-10-09 14:26:46 +02:00
Frank Celler
a85c44b25e
removed commented out lines, less verbose help
2015-10-09 13:51:18 +02:00
hkernbach
6cc0d4d184
new webui grunt build
2015-10-09 10:30:14 +02:00
Jan Steemann
7bfbbfd77f
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-09 09:42:28 +02:00
Jan Steemann
d572655d84
fixed compile warning
2015-10-08 16:28:04 +02:00
Jan Steemann
6a4e9658c5
fixes for explainer and condition
2015-10-08 16:22:52 +02:00
Jan Steemann
0d80a17002
generalize condition handling
2015-10-08 15:10:28 +02:00
hkernbach
d066a4283c
issue: #1446
2015-10-08 14:02:36 +02:00
Jan Steemann
fbfc7773ef
serialization and deserialization of IndexNodes
2015-10-08 12:02:27 +02:00
Jan Steemann
4bf3bb047b
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-07 17:25:56 +02:00
Jan Steemann
71a25e798b
mchacki: fixed development mode
2015-10-07 17:03:49 +02:00
Frank Celler
4b0911c799
added debugging header x-arango-v8-context
2015-10-07 13:37:35 +02:00
Jan Steemann
a1de2bfcc1
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
...
Conflicts:
CHANGELOG
2015-10-07 10:18:21 +02:00
Jan Steemann
d54db0e3ff
do not warn verbosely
2015-10-07 10:15:34 +02:00
jsteemann
358befddde
added test for issue #1521
2015-10-06 22:36:09 +02:00
Alan Plum
ea44c7710c
Rebuild aardvark
2015-10-06 16:35:00 +02:00
Alan Plum
3325d46211
Unbreak aardvark shell
2015-10-06 16:18:23 +02:00
Alan Plum
820e694d0c
Re-implement cleanupCancelation
2015-10-06 15:10:43 +02:00
Alan Plum
5b7f3d19d0
Deprecate CS in 2.9, not 2.8
2015-10-06 12:47:58 +02:00
Jan Steemann
849dad60cd
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-10-06 11:58:52 +02:00
Jan Steemann
beaf3acbd3
simplifications
2015-10-06 11:58:23 +02:00
Alan Plum
7332f3803e
Make org/arangodb/deprecated work in arangosh without db
2015-10-06 11:37:42 +02:00
Jan Steemann
1f009a046c
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-05 10:32:53 +02:00
Jan Steemann
1c990b7324
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
...
Conflicts:
arangod/Aql/ExecutionNode.cpp
2015-10-05 10:32:36 +02:00
Jan Steemann
3f622d71fb
fixed some require issues
2015-10-05 10:28:44 +02:00
Jan Steemann
7d4c379598
small modifications, temporarily disabled interchange-adjacent-enumerations
2015-10-02 19:53:35 +02:00
Wilfried Goesgens
232d0601cb
fix running of arangosh tests with the proper parametrization.
2015-10-02 15:47:01 +02:00
Wilfried Goesgens
a968707134
Fix foxx-manager test for running in arangosh
2015-10-02 15:39:49 +02:00
Wilfried Goesgens
3060e1d63d
lintify: break lines.
2015-10-02 15:01:38 +02:00
Wilfried Goesgens
353c01f04f
don't output the result json when running from an interactive shell.
2015-10-02 14:47:57 +02:00
Wilfried Goesgens
a5d8c12067
unittesting framework
...
- don't output xml reports if we run single tests
- add another token to the 'this is not a testcase name' list
2015-10-02 13:38:25 +02:00
Jan Steemann
8247ec0dff
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-02 12:59:13 +02:00
Wilfried Goesgens
320ac8e1e8
Improve indent readability
2015-10-02 12:31:09 +02:00
hkernbach
db7533acf8
jslint fix
2015-10-02 10:23:08 +02:00
hkernbach
3beb6a280f
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-10-02 10:02:30 +02:00
hkernbach
51a20beef3
graph test view
2015-10-02 10:02:25 +02:00
CoDEmanX
41d6594246
Documentation formatting
2015-10-02 03:14:55 +02:00
Jan Steemann
ab37a62858
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-01 17:29:24 +02:00
Wilfried Goesgens
1d2cf518dd
Add --skipArangoBNonConnKeepAlive to skip this part of the test for os'es that have a problem with to frequent ip connection open/close (windows, macos)
2015-10-01 17:09:43 +02:00
Jan Steemann
4175463248
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-01 16:00:13 +02:00
Wilfried Goesgens
c9cee71b2c
Fresh swagger docu
2015-10-01 13:30:55 +02:00
Wilfried Goesgens
aa12514b5c
Fix links; currently links in REST-documentation only work in the RESTDESCRIPTION :-(
2015-10-01 13:30:55 +02:00
Jan Steemann
c291a7117a
Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
2015-10-01 10:57:55 +02:00
Jan Steemann
7933fe5d4b
restore 2.6 behavior for db-based modules
2015-10-01 10:51:23 +02:00
Wilfried Goesgens
ab130a025f
add prefix to system app contexts - they shouldn't live without namespaces.
2015-09-30 17:55:55 +02:00
Jan Steemann
9205739f6a
added IndexNode
2015-09-30 14:10:04 +02:00
Jan Steemann
1ee1a87ae0
return proper errors to caller
2015-09-30 13:49:03 +02:00
Jan Steemann
74358962b5
fixed require on Windows
2015-09-30 13:06:36 +02:00
Jan Steemann
3b0b04b179
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-09-29 14:59:03 +02:00
Jan Steemann
96d8c24c61
fix app thumbnails
2015-09-29 14:58:35 +02:00
Frank Celler
3f8b2a4925
changed to dot notation
2015-09-29 14:14:57 +02:00
Frank Celler
f8c79f1ab0
added ARANGODB_DEFAULT_ROOT_PASSWORD
2015-09-29 13:15:25 +02:00
Jan Steemann
7bd9f03cb1
issue #1510 : Fix bug in the user app's storage in resolve function
2015-09-28 12:54:04 +02:00
Jan Steemann
2353fc648f
fixed documentation errors
2015-09-28 11:56:39 +02:00
Alan Plum
e26fc9b442
S'more.
2015-09-25 17:04:08 +02:00
Alan Plum
40837eacf1
Refactored db module loading
2015-09-25 17:02:51 +02:00
Alan Plum
a58fc5fdfa
Also add node/node_modules on Windows
2015-09-25 16:43:50 +02:00
Alan Plum
8c24b0c28b
Fixed missing thumbnail
2015-09-25 16:40:03 +02:00
Jan Steemann
0e6b1e64da
re-added reloadRouting()
2015-09-25 16:38:27 +02:00
Alan Plum
0fcb9ea46e
Fixed applicationContext.collectionName
2015-09-25 16:32:17 +02:00
Wilfried Goesgens
06b0057bb1
Fix module loading
2015-09-25 16:24:17 +02:00
Jan Steemann
3ce21453c3
added derived files
2015-09-25 16:01:36 +02:00
Jan Steemann
ace5bd8ec2
some fixes for the web interface
2015-09-25 16:01:13 +02:00
Jan Steemann
0ebf0be777
fixed Gruntfile to include cluster stuff
2015-09-25 15:07:24 +02:00
Wilfried Goesgens
cba3ed80ae
fix jslint: remove unused variable
2015-09-25 13:50:29 +02:00
Wilfried Goesgens
b280c59aa7
Split tests that don't work in clusters.
2015-09-25 11:50:33 +02:00
Jan Steemann
9e1d4b0c9d
updated CHANGELOG
2015-09-24 16:33:59 +02:00
Jan Steemann
7c992a5d51
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-09-24 16:05:15 +02:00
Jan Steemann
71f8d89eeb
allow installing Foxx applications in /_open/
2015-09-24 15:59:42 +02:00
Jan Steemann
a430cb9f6c
allow installing Foxx apps in /_open/
2015-09-24 15:54:09 +02:00
Alan Plum
1a5f5fe65d
Merge pull request #1508 from arangodb/require-sanity
...
Node-compatible require implementation
2015-09-24 15:50:40 +02:00
Jan Steemann
4249095456
issue #1507 : added optional *allowImplicit* sub-attribute for transactions
2015-09-24 15:50:00 +02:00
Alan Plum
963d9b082e
Removed hack for extension-free package main
2015-09-24 14:23:15 +02:00
Alan Plum
ac3e4b0c49
Linting
2015-09-24 14:20:15 +02:00
Wilfried Goesgens
a9ea2122d5
Revert 9cd38eba44
again.
2015-09-24 14:09:14 +02:00
Alan Plum
95d99ebd16
Make shell-foxx-manager-install-spec pass
2015-09-24 13:46:15 +02:00
Alan Plum
400532043f
Fixed shell-foxx-manager-install-spec module use
2015-09-24 13:46:15 +02:00
Alan Plum
98d2560b4c
Fixed shell-require test
2015-09-24 13:46:14 +02:00
Alan Plum
30588d556f
Add support for 'main: "index"' and expose globalPaths
2015-09-24 13:46:14 +02:00
Alan Plum
ef50d88f5e
Moved queue creation to queue manager init
2015-09-24 13:46:14 +02:00
Alan Plum
67e2264603
Fixed cyclic import
2015-09-24 13:46:14 +02:00
Alan Plum
f8ef55f437
Fixed Foxx preprocessing
2015-09-24 13:46:14 +02:00
Alan Plum
252cba5e9f
Implemented FoxxService
2015-09-24 13:46:14 +02:00
Alan Plum
309dcb2c17
Partially implemented FoxxService
...
The FoxxService class replaces ArangoApp and should contain the necessary logic to load Foxx services based on their manifests.
2015-09-24 13:46:14 +02:00
Alan Plum
763d206c40
Rebuilt aardvark shell
2015-09-24 13:46:14 +02:00
Alan Plum
f021cdc471
Implemented require from db collection
2015-09-24 13:46:13 +02:00
Alan Plum
038267cb06
Re-implemented require/module based on Node 4.1.0
...
The require function should now behave as expected and treat ArangoDB's module paths as sources for "external" modules.
The "assert", "buffer" and "path" modules have been moved out of ./js/node into the bootstrap modules.
The module "org/arangodb/foxx/arangoApp" (as well as any modules depending on it) is incompatible with the new module loading behaviour and will be have to be rewritten from scratch.
The "Package" class has been removed entirely and is no longer needed.
Support for the database-stored modules is currently missing and needs to be re-implemented within the module loader.
2015-09-24 13:46:13 +02:00
Alan Plum
f19263ab78
Added eslintrc
2015-09-24 13:46:13 +02:00
Alan Plum
798b4fc521
Added more Node stubs
2015-09-24 13:46:13 +02:00
Alan Plum
52f1cf6e2c
Updated util to 4.1.0
2015-09-24 13:46:13 +02:00
Alan Plum
e57c383dea
Updated path to 4.1.0
2015-09-24 13:46:12 +02:00
Alan Plum
69a4352394
Added unmentioned modules to VERSIONS
2015-09-24 13:46:12 +02:00
Alan Plum
de7b507dea
Updated querystring to 4.1.0
2015-09-24 13:46:12 +02:00
Alan Plum
77cca88c50
Updated string_decoder to 4.1.0
2015-09-24 13:46:12 +02:00
Alan Plum
af7c11132a
Updated url to 4.1.0
2015-09-24 13:46:12 +02:00
Alan Plum
ae310b0696
Updated punycode to 4.1.0
2015-09-24 13:46:12 +02:00
Alan Plum
47f691ed36
Updated events to 4.1.0
2015-09-24 13:46:12 +02:00
Alan Plum
ca793a3f5d
Added http, https stubs
2015-09-24 13:46:12 +02:00
Jan Steemann
56a5912260
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-09-24 13:00:57 +02:00
Jan Steemann
a8c97051f6
unified base URL (to not start with a slash, all other actions have base URLs that do not start with a slashes either)
2015-09-24 12:12:12 +02:00
Jan
ebfdf38c08
Merge pull request #1505 from jsteemann/devel
...
added generated files
2015-09-24 12:04:56 +02:00
Wilfried Goesgens
9cd38eba44
Partially revert 6aabcb99c5
- this http interface is still required for blueprints.
2015-09-23 17:02:42 +02:00
hkernbach
d21f375ade
scss
2015-09-23 16:40:09 +02:00
Wilfried Goesgens
6aabcb99c5
Remove deprecated graph documentation.
2015-09-23 14:26:24 +02:00
Wilfried Goesgens
44c2063662
Add information about the graph the samples are querying so the user has a better overview.
2015-09-23 14:12:18 +02:00
hkernbach
1b8e6ddfec
renamed a graph viewer label
2015-09-22 15:58:31 +02:00
hkernbach
9e79c27b64
finalized issue #1433
2015-09-22 15:22:51 +02:00
hkernbach
108b873b28
graphViewer css
2015-09-22 15:00:58 +02:00
hkernbach
285a404d8e
fixed issue #1499 , added possibility to change graph vertex number
2015-09-22 14:55:52 +02:00
hkernbach
63a23f81bc
web ui navigation dropdown issue
2015-09-22 13:40:00 +02:00
hkernbach
d1fe228e8f
issue: #1487
2015-09-22 13:31:25 +02:00
Michael Hackstein
a862f0ea30
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-09-22 11:46:32 +02:00
Michael Hackstein
aa1242b67c
Fixed a bug with AQL EDGES() function. It did not include the correct
...
end of the edge when using inbound or outbound in combination with
includeVertices. Reported at
https://groups.google.com/forum/#!topic/arangodb/6yIpzLHprrk
2015-09-22 11:46:11 +02:00
hkernbach
5946452201
css, issue: #1488
2015-09-22 11:26:42 +02:00
hkernbach
604458b4b3
fixed issue: #1486
2015-09-22 11:03:49 +02:00
Jan Steemann
1e8ffad44e
added generated files
2015-09-22 10:35:33 +02:00
hkernbach
b8a5e56cb7
fixed issue #1494 , fixed some grunt processing
2015-09-22 10:27:04 +02:00
hkernbach
3643159055
added es6 to es5 conversion for some modules, fixed issue #1485
2015-09-22 09:28:46 +02:00
CoDEmanX
7b95679040
Minor documentation fixes
2015-09-21 19:37:32 +02:00
Michael Hackstein
a3e17f8eb6
Added a test for large skip value and skiplist sorting
2015-09-21 13:29:29 +02:00
Michael Hackstein
0d3a095736
Fixed a bug in AQL execution which caused LIMIT <skip> <total> to fail after sorting based on an attribute with skiplist index
2015-09-21 13:15:56 +02:00
Alan Plum
47a06b1fdc
Pretty print classes in console
2015-09-19 05:03:45 +02:00
Alan Plum
fb2d334741
Resolved merge conflict introduced in b6995ba
.
2015-09-18 17:39:22 +02:00
Jan Steemann
d1c75013e7
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-09-18 17:28:10 +02:00
Jan Steemann
f2d42ec67c
removed superfluous print statement
2015-09-18 17:27:25 +02:00
Wilfried Goesgens
15b1d7cfd5
Migrate sub-structured replies to swagger2 preproc docu style
2015-09-18 17:02:53 +02:00
Michael Hackstein
1a7f414c16
Merge branch 'devel' of github.com:arangodb/arangodb into JHMH
2015-09-18 12:21:39 +02:00
Frank Celler
c4d1fff729
new traversal
2015-09-18 10:40:28 +02:00
Jan Steemann
5b65471540
added generated file
2015-09-17 17:52:41 +02:00
Wilfried Goesgens
2e91374cd6
Fresh swagger.
2015-09-17 17:28:37 +02:00
Wilfried Goesgens
435b6e9382
lint.
2015-09-17 17:28:26 +02:00
Wilfried Goesgens
90aab26866
Add html reply logger
2015-09-17 15:54:27 +02:00
Wilfried Goesgens
7f89e6e905
Add hint to the user that starting swagger may take a while.
...
A throbber won't do, since swagger is synchroneous and the browser won't animate it.
2015-09-17 13:29:49 +02:00
Wilfried Goesgens
b06d03e84f
Cleanup documentation for remaining @-tags
2015-09-17 11:15:33 +02:00
jsteemann
335e46d222
added generated documentation
2015-09-16 19:59:17 +02:00
jsteemann
0196dc0f51
documentation fixes
2015-09-16 19:58:59 +02:00
Jan Steemann
32113cc031
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-09-16 16:58:26 +02:00
Wilfried Goesgens
70a2c74c1b
Update RESTAPI documentation handling to work with the swagger 2 api
...
- use the structures from the swagger for post / reply structures
- add missing documentation snippets to their respective places
- fix syntax of documentation blocks
2015-09-16 16:35:13 +02:00
Jan Steemann
74ca6ce9f8
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-09-16 16:11:05 +02:00
Jan Steemann
907d98f3dd
fixes for sync
2015-09-16 16:10:56 +02:00
Frank Celler
2e2600311a
added aliases
2015-09-16 16:05:18 +02:00
Frank Celler
c892174c6a
added nightly
2015-09-16 15:14:34 +02:00
Jan Steemann
c5c51f14da
added tests for syncCollection
2015-09-16 11:40:57 +02:00
Jan Steemann
a1dc321516
added more compaction tests
2015-09-16 11:39:41 +02:00
Jan Steemann
a1a87c0c34
jslint
2015-09-15 14:23:26 +02:00