Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
44,088 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

115 Commits

Author SHA1 Message Date
jsteemann 55eda66d4a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-27 15:57:56 +02:00
Jan Christoph Uhde 36167b8e17 Merge remote-tracking branch 'origin/devel' into obi-velocystream-4 
* origin/devel: (23 commits)
  Fix trusted origin tests
  Fix CORS with credentials
  New version of script.
  updated CHANGELOG
  grunt build [ci skip]
  improved gv
  added expand function to gv
  enable: compile_commands.json
  semistandard fix
  improved gv
  gv bugfix
  updated license
  improved gv
  Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
  improved gv performance
  fix handling of empty query strings
  fixed query editor issues
  Modularize perf script.
  Add one more event.
  Add a first perf probe monitoring script.
  ...

Conflicts:
	arangod/GeneralServer/HttpCommTask.cpp
 2016-07-27 13:25:34 +02:00
Andreas Streichardt 5fe3274000 Fix CORS with credentials 2016-07-27 11:25:46 +02:00
Jan Christoph Uhde 9965ca9c6a Merge branch 'obi-velocystream-2' into obi-velocystream-3 
* obi-velocystream-2: (21 commits)
  enable VPACK
  add some documentation
  add some documenation
  get rid fo cookies in non-http requests
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  remove body() method from GeneralRequest
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
  Complete to __aarch64__ achritectur
  add: VppResponse
  cppcheck
  ...

Conflicts:
	arangod/GeneralServer/GeneralCommTask.cpp
	arangod/GeneralServer/GeneralCommTask.h
	arangod/GeneralServer/HttpCommTask.h
 2016-07-27 10:11:50 +02:00
Frank Celler e008a3b306 moved accessControlAllowOrigins to GeneralServerFeature 2016-07-27 09:09:07 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
Jan Christoph Uhde d93b709b4f add some documentation 2016-07-26 13:51:56 +02:00
jsteemann 2d293261cc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:54:12 +02:00
jsteemann fe99ca558a removed unused code path 2016-07-25 16:52:39 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Frank Celler 23d7fc7247 moved startThread from HttpCommTask to RestHandler 2016-07-25 16:40:29 +02:00
Frank Celler 96e69b5b92 moved create of CommTask into ListenTask 2016-07-23 20:04:38 +02:00
Frank Celler a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
Jan Christoph Uhde b8c705868e Split Http- and HttpsCommTask 
add .ctags_exclude and new CommTasks

move some code form GeneralCommTask to HttpCommTask

move more code into HttpCommTask

fix ording or initialization

if access of classes

make _requestAsHttp() private

more cleanup
 2016-07-23 01:17:48 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00