1
0
Fork 0
Commit Graph

27095 Commits

Author SHA1 Message Date
Frank Celler f064df522f force variable 2016-03-01 12:40:10 +00:00
Michael Hackstein a424876d00 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-01 13:39:57 +01:00
Michael Hackstein d3a53cd9bf Replaced the word tokenizer TRI_string_vector_t version by a std::vector<std::string> version 2016-03-01 13:39:17 +01:00
Michael Hackstein fa8b4ae0e3 Removed Velocypack from FulltextIndex. And replaced TRI_string_vector_t with std::vector<std::string> 2016-03-01 13:35:47 +01:00
Jan Steemann be80898e97 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 13:17:27 +01:00
Frank Celler 3574333b5e added VERBOSE, fixed typo 2016-03-01 13:15:51 +01:00
hkernbach 0ebf8a2f53 frontend system collection, multiple queries aql editor, styling, grunt 2016-03-01 13:10:37 +01:00
Frank Celler 592eeb4383 added VS flags 2016-03-01 12:49:29 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00
Frank Celler c202efa80e cleanup 2016-03-01 12:33:27 +01:00
Jan Steemann e0e84b7ea1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:50:48 +01:00
Jan Steemann 102066b4ee removed methods 2016-03-01 11:50:16 +01:00
hkernbach f31cee26bd aardvark, grunt 2016-03-01 11:34:56 +01:00
Frank Celler 0d13d6609a renamed to _frontend 2016-03-01 11:25:07 +01:00
Jan Steemann 21e5e68ae5 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:14:55 +01:00
Jan Steemann 6c152649d4 added allKeys() method 2016-03-01 11:14:40 +01:00
hkernbach 228f53885b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-01 11:08:06 +01:00
hkernbach 87b9e0d7db fixed download query with bind params, scss, included query stats in aql editor 2016-03-01 11:07:57 +01:00
Frank Celler 995bffc39e Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 10:20:27 +01:00
Frank Celler 9eda75c34a cleanup 2016-03-01 10:20:22 +01:00
Frank Celler 48b60204cc cleanup flags 2016-03-01 10:15:31 +01:00
Frank Celler a8f9ed82a7 use only one test 2016-03-01 10:15:13 +01:00
Max Neunhoeffer ad97830d7f Add babies to insert document API (V8 & HTTP & Transaction). 2016-03-01 10:14:24 +01:00
jsteemann 945b6b28a3 removed old deletion marker type 2016-03-01 00:27:19 +01:00
jsteemann 1595566af6 removed a few marker types 2016-02-29 23:55:38 +01:00
jsteemann 802e944baa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 23:31:53 +01:00
jsteemann adae2e7c67 fixed saving 2016-02-29 23:31:21 +01:00
Simran Brucherseifer 189256dcad Minor change to changelog 2016-02-29 22:28:24 +01:00
Wilfried Goesgens b70e38f794 Also work with the linker include directories here. 2016-02-29 19:28:13 +01:00
Frank Celler 6ff9a7610e shutup message about VS15 2016-02-29 19:13:21 +01:00
Wilfried Goesgens 39e180c4da Work on cmake library directories. 2016-02-29 19:04:10 +01:00
Frank Celler b1de079b04 added OPENSSL LIBS directly 2016-02-29 17:59:55 +00:00
Michael Hackstein 2a9d071627 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 18:46:43 +01:00
Michael Hackstein a48c1819bc Added an Implementation for AQL condition Iterator in HashIndex 2016-02-29 18:46:38 +01:00
Jan Steemann 4140c3fa93 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 18:33:29 +01:00
Jan Steemann eae225f4c8 changed marker storage 2016-02-29 18:33:16 +01:00
Frank Celler a430a0e07f added path 2016-02-29 17:14:41 +00:00
Michael Hackstein ae7da462d0 Removed Import of *shape* in Indexes 2016-02-29 18:10:02 +01:00
Michael Hackstein 11102d4799 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 18:00:36 +01:00
Michael Hackstein b29b84687b Removed shape* include 2016-02-29 18:00:31 +01:00
Michael Hackstein cb40281543 Unshapified the GeoIndex 2016-02-29 17:58:26 +01:00
Frank Celler 134d7058c1 Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris 2016-02-29 16:49:15 +00:00
Frank Celler f55937191f fixed typo 2016-02-29 16:49:11 +00:00
Frank Celler daef04b799 cleanup includes, fixed typo 2016-02-29 17:44:50 +01:00
Jan Steemann d122ace96a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 17:44:37 +01:00
Frank Celler 2a3ee1f9a4 cleanup includes 2016-02-29 17:44:26 +01:00
Frank Celler 87ba797adc added patch file 2016-02-29 17:27:07 +01:00
Frank Celler 795e158070 added patch file 2016-02-29 17:24:46 +01:00
Frank Celler 32685a1c69 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-29 17:15:11 +01:00
Jan Steemann 254f6b49b9 write prologue markers for document & remove markers 2016-02-29 17:08:38 +01:00