1
0
Fork 0
Commit Graph

3395 Commits

Author SHA1 Message Date
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +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
Jan Steemann 3396214a63 added db._explain() convenience function 2015-10-21 12:52:40 +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
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
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
Jan Steemann d6cad3bac6 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 18:55:36 +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
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
Jan Steemann 0ffb11c25e do not use sparse indexes for sorting 2015-10-14 12:03:52 +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
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
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 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
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 a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
Conflicts:
	CHANGELOG
2015-10-07 10:18:21 +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
Jan Steemann 7d4c379598 small modifications, temporarily disabled interchange-adjacent-enumerations 2015-10-02 19:53:35 +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
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
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 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