1
0
Fork 0
Commit Graph

1629 Commits

Author SHA1 Message Date
Jan Steemann da06e4271b Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel 2012-05-10 11:17:19 +02:00
Jan Steemann 85cde255e3 fixed and simplified subqueries 2012-05-10 11:17:01 +02:00
Frank Celler 75ef3d614c Merge branch 'devel' of github.com:triAGENS/AvocadoDB
Conflicts:
	V8/v8-vocbase.cpp
2012-05-10 10:44:40 +02:00
Frank Celler 61cf587ac8 cleanup, remove deprecated stuff 2012-05-10 10:37:13 +02:00
Frank Celler baf039b608 cleanup, remove deprecated stuff 2012-05-10 09:45:11 +02:00
Frank Celler 32110b4ba8 ignore ordering for hash index 2012-05-09 23:25:43 +02:00
Jan Steemann 4ceb707090 range optimizer fixes 2012-05-09 19:24:46 +02:00
Jan Steemann b1a4cec863 some bugfixes for subqueries 2012-05-09 15:02:07 +02:00
Jan Steemann 87b348876c fixed code generation for subqueries 2012-05-09 14:23:26 +02:00
Jan Steemann e51300e804 Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel 2012-05-09 13:13:20 +02:00
Jan Steemann 4434a96bb3 more optimisations 2012-05-09 13:13:05 +02:00
Heiko Kernbach 59a9c98db1 Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel 2012-05-09 11:17:26 +02:00
Heiko Kernbach b8bd447cac navstyle 2012-05-09 11:17:16 +02:00
Jan Steemann a78053805e Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel 2012-05-09 11:16:58 +02:00
Jan Steemann 926a158a99 refactored range optimizer 2012-05-09 11:16:37 +02:00
Frank Celler 38e2cf01cc added configuration 2012-05-09 11:15:01 +02:00
Frank Celler add0aff2c3 Merge branch 'devel' of github.com:triAGENS/AvocadoDB 2012-05-09 10:41:49 +02:00
Jan Steemann 4174b215f7 some optimisations 2012-05-09 09:53:32 +02:00
Heiko Kernbach e062eb3b3d Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel 2012-05-09 09:49:30 +02:00
Heiko Kernbach 9f0ef666f8 navstyle 2012-05-09 09:49:10 +02:00
Jan Steemann 2234a38ab9 more test cases 2012-05-09 09:11:33 +02:00
Jan Steemann ada9a72dd7 added tests 2012-05-09 01:04:56 +02:00
Jan Steemann 135362ab6e added some tests 2012-05-09 00:19:17 +02:00
Jan Steemann e612faf68b fixed GCC 4.6.3 compile warnings 2012-05-08 23:07:34 +02:00
Jan Steemann 96903af8e4 fixed memleaks 2012-05-08 17:40:19 +02:00
Frank Celler 3c7a4a627c added path under /_api 2012-05-08 17:16:14 +02:00
Frank Celler facc0c499b added hash test 2012-05-08 17:00:57 +02:00
Frank Celler 34165412f5 fixed null values 2012-05-08 16:55:29 +02:00
Jan Steemann 1816a56fb2 Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel 2012-05-08 16:49:32 +02:00
Jan Steemann d2d1cdfd93 fixed ifdef 2012-05-08 16:49:18 +02:00
Frank Celler 5a93599712 fixed handling of null 2012-05-08 15:46:54 +02:00
Frank Celler 90285ea45a fixed banner 2012-05-08 15:46:38 +02:00
Frank Celler 862d4c022a fixed banner 2012-05-08 15:46:33 +02:00
Heiko Kernbach 1ac35825e4 Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel 2012-05-08 15:03:02 +02:00
Heiko Kernbach 7600a9a6e8 style/sliderbutton 2012-05-08 15:02:56 +02:00
Jan Steemann cd7a6f5ea2 Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel 2012-05-08 13:22:40 +02:00
Jan Steemann a2adfb65f4 uniquification, intersection and union of json lists 2012-05-08 13:22:06 +02:00
Heiko Kernbach 9f63a4f225 Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel 2012-05-08 13:01:36 +02:00
Heiko Kernbach 1f0d6f854b update 2012-05-08 13:01:27 +02:00
Jan Steemann bf21b866aa Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel
Conflicts:
	configure
2012-05-08 12:38:41 +02:00
Jan Steemann 9d9fe180b9 moved json utility function to their own file (json-utilities.c) 2012-05-08 12:34:43 +02:00
Frank Celler a5190bd51e fixed merge problems 2012-05-08 09:41:23 +02:00
Frank Celler db868d1147 Merge branch 'oreste' of github.com:triAGENS/AvocadoDB
Conflicts:
	BasicsC/vector.c
2012-05-08 09:31:26 +02:00
Frank Celler de0b90b664 merged with oreste 2012-05-08 09:28:18 +02:00
Frank Celler 30e9e66830 generated 2012-05-08 09:26:30 +02:00
Frank Celler fb5034b0cf Merge branch 'devel' of github.com:triAGENS/AvocadoDB 2012-05-08 09:25:59 +02:00
Heiko Kernbach 78afd8d41f Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel 2012-05-08 09:21:01 +02:00
Heiko Kernbach 57021e1ce2 style 2012-05-08 09:20:50 +02:00
Jan Steemann 3bbb236c50 Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel 2012-05-07 19:28:30 +02:00
Jan Steemann 3e1a30d51b added filter expression optimisation, still inactive 2012-05-07 19:27:58 +02:00