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

531 Commits

Author SHA1 Message Date
Wilfried Goesgens f5d14029c8 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 15:36:25 +01:00
Jan Steemann 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Frank Celler 9342b0bab9 be verbose 2016-03-02 14:08:18 +01:00
Frank Celler c719beccc4 added BASE_LD_FLAGS and BASE_LIBS 2016-03-02 12:45:04 +01:00
Wilfried Goesgens f1a2f5e393 Styleguide cleanups as cmakelinter hints 2016-03-02 11:45:55 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Frank Celler c8b5ea0129 added -Wno-unused-parameter 2016-03-01 17:50:40 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Kaveh Vahedipour 4435236e91 property_map 2016-03-01 08:52:20 +01:00
Kaveh Vahedipour 0ac54c3300 agency on 2016-02-26 17:44:14 +01:00
Jan Steemann 68461e6f74 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 11:00:25 +01:00
Frank Celler e2f5a8a8c3 added USE_OPENSSL_NO_SSL2 2016-02-26 10:50:03 +01:00
Jan Steemann c0fd3b13ca Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 10:19:17 +01:00
Michael Hackstein 421df55e89 fixed tests 2016-02-26 09:34:56 +01:00
Kaveh Vahedipour efb0a16988 Unit tests only in maintainer mode 2016-02-26 09:33:05 +01:00
Kaveh Vahedipour 34976d462f agency on 2016-02-26 09:31:05 +01:00
Frank Celler ca7651cc8d added all tools 2016-02-25 20:29:02 +01:00
Frank Celler 52ac7742d5 removed lib again 2016-02-25 20:26:33 +01:00
Frank Celler e02b6f99cd added lib for documentation 2016-02-25 20:25:15 +01:00
Frank Celler 3568d10bd3 added dependencies for tests 2016-02-25 20:23:42 +01:00
Frank Celler e57a077c1b added dependencies 2016-02-25 20:21:04 +01:00
Frank Celler 874ae123f6 added some help tests 2016-02-25 19:13:42 +01:00
Frank Celler 06256947fa splitted into 3rd libs 2016-02-25 18:51:17 +01:00
Frank Celler b1a56dd59c moved BOOST to its own CMakeLists.txt 2016-02-25 18:51:17 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
AutoBuilder df1c591f51 Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris 2016-02-25 14:26:16 +01:00
AutoBuilder 325a045fef added link flags 2016-02-25 14:26:12 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Frank Celler cb6f4c024b fixed boost unittests test 2016-02-24 23:43:07 +01:00
Frank Celler 554cf0594a changed order of V8 and ICU 2016-02-24 23:17:24 +01:00
Frank Celler 8c632cae24 Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 
Conflicts:
	CMakeLists.txt
 2016-02-24 22:41:00 +01:00
Frank Celler 42dbf45264 fixed libs 2016-02-24 22:40:31 +01:00
Frank Celler ea44c604b6 fixed boost 2016-02-24 22:39:53 +01:00
Frank Celler 22d0f3049b added boost link test 2016-02-24 21:04:42 +01:00
Frank Celler 0ef991de91 removed debug output 2016-02-24 20:35:50 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Wilfried Goesgens 0bf90a712a Add version, and way to detect local boost. 2016-02-24 14:04:19 +01:00
Frank Celler 43be85e72b more cleanup 2016-02-24 10:30:30 +01:00
jsteemann d6fcbb0299 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 21:51:12 +01:00
jsteemann 47b684a75a fixed maintainer mode 2016-02-23 21:49:57 +01:00
jsteemann 0c5e11dca9 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 21:34:11 +01:00
Frank Celler 48e39567fc fixed man page generation 2016-02-23 21:28:14 +01:00
Frank Celler fed3dee2fa more cleanup 2016-02-23 20:36:33 +01:00
Frank Celler 0f1a8e66d5 removed old cpp files 2016-02-23 15:28:32 +01:00
Frank Celler 9fca3425a1 cleanup 2016-02-23 15:28:31 +01:00
Frank Celler 0639e688f5 added FLEX and BISON 2016-02-23 15:27:34 +01:00
Frank Celler 5b0d9e2ef6 cleanup of unsed variables 2016-02-23 15:25:06 +01:00
Wilfried Goesgens 2968cc81da Finalize work on solaris with static library linking. 2016-02-23 14:28:27 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Frank Celler 97e80b848e added FLEX and BISON 2016-02-23 12:26:10 +01:00
Wilfried Goesgens 8632080bdc - remove rasbian stuff 
- make solaris link stattic using the csw linker
 - cleanup V8 & ICU include & libraries.
 2016-02-23 11:23:51 +01:00
Wilfried Goesgens 0a0aa11b42 re-add Z & EV to the library directories. 2016-02-22 13:52:52 +01:00
Frank Celler 21c6e94cfb included libev and zlib as project 2016-02-22 09:57:44 +01:00
Frank Celler bec68b7427 added libev_INCLUDE_DIR 2016-02-20 17:18:39 +01:00
Frank Celler 0643923f4a Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-02-20 13:06:44 +01:00
Frank Celler 5365c39f8f added current build to for include 2016-02-20 12:55:29 +01:00
Wilfried Goesgens 0f548c92d5 Remove directory part that comes from the variable. 2016-02-19 18:52:04 +01:00
Wilfried Goesgens 9a5cf6dfb4 Export directories with the icu & v8 libraries into the calling scope 2016-02-19 18:35:15 +01:00
Wilfried Goesgens 8608fae2d1 Move stuff around 
- properly calculate ICU
 - propagate PYTHON_EXECUTABLE into the make file for V8
 2016-02-19 17:57:45 +01:00
Wilfried Goesgens 4a9dc3cbd4 More solaris compatibility 2016-02-19 15:52:32 +01:00
Wilfried Goesgens 9907c4e4a6 More forcing of the compiler on solaris; fix V8 location for arangodb build. 2016-02-19 14:47:27 +01:00
Jan Steemann e4fb8b184b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:51:52 +01:00
Wilfried Goesgens 0700ccc847 start to use gyp directly from cmake; add 64 bits detection; remove old arm stuff. 2016-02-19 12:46:28 +01:00
Frank Celler 417db335ab removed old files 2016-02-19 12:26:26 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Max Neunhoeffer ac7a3e6d6a Switch off assembler CRC32 on Windows by default. 2016-02-19 10:59:13 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
Jan Steemann 22fa100657 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 17:54:51 +01:00
Kaveh Vahedipour 541aefdd2e Reestablished love 2016-02-18 17:32:35 +01:00
Jan Steemann 433cd14d7e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 14:44:05 +01:00
Frank Celler ad38238da7 added swagger, USE_FAILURE_TESTS, ARANGODB_VERSION 2016-02-18 14:02:39 +01:00
Max Neunhoeffer 2ef2ec7292 Add assembler optimized CRC version. 
Compile in only if architecture is x86_64 and no user override.
If compiled in, use runtime detection of SSE4.2 extensions using
the CPUID intrinsic.
 2016-02-17 23:17:23 +01:00
Max Neunhoeffer d0dc195949 Take out a debug message. 2016-02-17 14:45:06 +01:00
Kaveh Vahedipour c4c7bfbd5b Checking for architecture. Providing include (TargetArch) 2016-02-17 13:21:03 +00:00
Kaveh Vahedipour 360a24f65d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-17 09:22:11 +00:00
Kaveh Vahedipour d5ba21ff61 Build of etcd should only be attempted, when Go is found >= 1.2 2016-02-17 09:22:07 +00:00
Kaveh Vahedipour 411ef9185c Fxing for Release and Debug build types 2016-02-16 23:16:28 +01:00
Kaveh Vahedipour 112ac719f5 Fxing for Release and Debug build types 2016-02-16 23:09:00 +01:00
Frank Celler b4286a66fc added USE_FAILURE_TESTS 2016-02-16 16:30:59 +01:00
Kaveh Vahedipour 2955f33006 Checking C++11 features. 2016-02-12 17:43:45 +00:00
Kaveh Vahedipour f313c7120d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 17:08:13 +00:00
Jan Steemann 13cceddbcc removed linenoise option 2016-02-12 18:07:42 +01:00
Kaveh Vahedipour 8ac5ccfdff Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 17:06:03 +00:00
Kaveh Vahedipour ce9ec76199 ENABLE_RELATIVE 2016-02-12 17:05:43 +00:00
Kaveh Vahedipour 5d3fe9afe6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 15:53:11 +01:00
Kaveh Vahedipour c3212f2d5d added support for detection of cpu_family 6 model 61 2016-02-12 15:33:53 +01:00
Kaveh Vahedipour 05ef0d2711 linenoise library should be automatically included 2016-02-12 12:44:05 +00:00
Kaveh Vahedipour 8607d8bbe4 icu dependencies of tests 2016-02-12 13:09:03 +01:00
Kaveh Vahedipour 068386338a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-12 11:13:33 +01:00
Kaveh Vahedipour b61e6c8f64 Checking for compiler features 2016-02-12 11:13:24 +01:00
Kaveh Vahedipour 409d03a850 Finding tcmalloc 2016-02-11 17:49:55 +00:00
Kaveh Vahedipour f2ee7c0d0b OpenSSL > 1.1.0 ends support of SSLv2 2016-02-11 18:20:41 +01:00
Andreas Streichardt f14bf5496f Check for a specific python version, so v8 is building 2016-02-11 14:21:55 +01:00
Kaveh Vahedipour 9db6089ec5 Testing need for static linking of OPENSSL 2016-02-09 10:22:10 +01:00
Kaveh Vahedipour c6c121e59b Mild optimisation and CMAKE_MAKE_PROGRAM for V8 build rather than 'make' 2016-02-09 10:13:45 +01:00
Kaveh Vahedipour 1a368e1ce3 Back to OSX for tests 2016-02-08 22:30:11 +01:00
Kaveh Vahedipour c9d4d5fd32 Linux V8/ICU are in deeper directories 2016-02-08 17:32:21 +00:00
Kaveh Vahedipour 9d65e68998 First successful OSX build 2016-02-08 18:02:43 +01:00
Kaveh Vahedipour c626ecc59b First successful OSX build 2016-02-08 16:17:10 +01:00
Kaveh Vahedipour 0a068ed86a OpenSSL check on OSX finds shipped 0.98. We need better than that. 2016-02-01 15:41:08 +01:00
Kaveh Vahedipour 6194a83437 making progress building unix versions 2016-02-01 13:06:06 +00:00
Jan Christoph Uhde 03409a84cc fix icu related linking issues 2016-01-31 23:06:24 +01:00
Kaveh Vahedipour 3f39a10bf8 Integrated obiwahn contributions 2016-01-25 13:46:44 +01:00
Jan Christoph Uhde 1a44d102ed add v8 and icu as imported targets 2016-01-23 15:06:33 +01:00
Kaveh Vahedipour 5662bf012e Building on OSX 2016-01-21 15:42:54 +01:00
Kaveh Vahedipour 5679410317 Building on OSX 2016-01-21 15:17:43 +01:00
Jan Christoph Uhde 553d02a011 add option for system provided libs 2016-01-15 17:41:13 +01:00
Jan Christoph Uhde d89e083bd3 add file for 3rd party and boost 2016-01-15 17:13:05 +01:00
Jan Christoph Uhde 306eac4484 fix: local configuration can now be found by more projects 2016-01-15 00:10:18 +01:00
Jan Christoph Uhde b53cb6188a fix: build on debian sid -- bumped cmake version 2016-01-14 23:40:52 +01:00
Wilfried Goesgens 5ea0fe49b1 Multi -purpose- -> model 2015-12-11 18:22:23 +01:00
Wilfried Goesgens 179778bddd Simplify include paths as its done for the other binaries. 2015-12-11 16:54:12 +01:00
Wilfried Goesgens f39cf6485c Add velocypack detection to CMakeList 2015-12-11 16:30:19 +01:00
Frank Celler 7c9a0de284 added README and LICENSES 2015-11-07 20:21:45 +01:00
Jan Steemann 8db2018eb5 updated linenoise version 2015-11-03 16:07:48 +01:00
Jan Steemann 03da10bb51 attempt to fix failing Windows build 2015-10-22 18:03:07 +02:00
Frank Celler b7de227138 removed readline 2015-10-22 15:41:33 +02:00
Frank Celler b58d0702bd fixed number of contexts for ARM 2015-10-08 15:26:40 +02:00
Jan Steemann cf7ea23024 cmake test end 2015-09-04 15:48:00 +02:00
Jan Steemann fcb380b0f6 cmake test 2015-09-04 15:42:29 +02:00
Jan Steemann f9b90fc3bf cmake test 2015-09-04 15:24:08 +02:00
Jan Steemann b146fc90a1 changed variable name (USER_MAINTAINER_MODE -> USE_MAINTAINER_MODE) 2015-09-04 14:57:23 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Willi Goesgens edabac8927 Add Version information & icons to the windows binaries. 2015-07-17 16:36:40 +02:00
Jan Steemann 80c919a9d7 moved boost modules, add missing modules 2015-07-16 20:57:28 +02:00
Jan Steemann efb68a2e6c added boost::lockfree and removed mutex in statistics 2015-07-16 20:24:58 +02:00
Willi Goesgens b8c6e96a59 Adjust infrastructure to the new V8 2015-06-18 13:23:11 +02:00
Willi Goesgens 8e858bc96d Upgrade V8 to 4.2.77 
- v8 now requires llvm libstdc++ inline
  - ForceDelete is gone now; employ new tactics of working with wrapping shaped json
  - gold crashes while linking V8, remove it.
 2015-05-20 15:10:28 +02:00
Willi Goesgens 592f21bdae Adjust the windows build to the new icu version. 2015-04-29 14:27:49 +02:00
Willi Goesgens bd27d57ce0 Add pass through for Include paths from outside in. 2015-04-20 10:17:59 +02:00
Jan Steemann e09328341c fixed typo in build instructions 2015-03-26 10:42:40 +01:00
Willi Goesgens 1a269dcee1 Fix sequence so TRI_BINDIR_INSTALL is defined. 2015-03-23 19:07:56 +01:00
Willi Goesgens 9fbfcf245e more places to remove mruby 2015-03-23 19:05:29 +01:00
Willi Goesgens c4ecaffbb4 Remove MRuby from the macos build 2015-03-23 18:58:55 +01:00
Willi Goesgens 9f179c49fd Work on windows installer 
- fix Icon reference in registry; mustn't add the compile directory to the path; Now the software uninstall list shows our Fruit.
  - DRY: use a define for the service name
  - more comments whats going on
  - fix WaitForServiceUp - it would run endless because of a syntax error. NSIS - when to do braces and when not? GRRR.
  - Add human readable description to the service name
  - Check whether the ArangoDB-Service in charge points to our binary - so we don't accidently remove a service installed by another version of ArangoDB
 2015-03-18 15:59:15 +01:00
Willi Goesgens 8342953730 Rework installer 
- no more commands are substituted in from CMakeList.txt - this makes the NSIS template better readable
  - BITS are substituted in via the define section
  - Build the Registry uninstall key at the start of the file to respect DRY.
  - fix error messages
  - fix typos in function names
  - only try to open Aardvark in the browser if we install a service
  - Use Switch instead of Rumpelstilskin if
  - Restore the install-type on uninstall first
    - we need to set SetShellVarContext according to it so the meaning of
      - SHCTX
      - $SMPROGRAMS
      are right.
    - we need to know whether we need to uninstall a service.
 2015-03-13 12:53:07 +01:00
Willi Goesgens 0ff1672f3c Re-Add switch between 32/64 bit registry 2015-03-09 10:45:34 +01:00
Frank Celler 0687e4e080 removed registry entry, using relative path to binary instead 2015-03-08 20:06:18 +01:00
Frank Celler 49ace658ca removed mruby 2015-03-03 16:53:26 +01:00
Willi Goesgens b2b263f212 fix calculation of etc directory for windows install. 2015-02-27 14:15:01 +01:00
Frank Celler f7fb27e4ea added etcd 
Conflicts:
	CMakeLists.txt
 2015-02-26 00:00:55 +01:00
Jan Steemann 2ec83e31f8 fixed CMake instructions for linking on Linux 2015-02-19 16:10:14 +01:00
Willi Goesgens 5e1720132f Stacktraces & asserts for windows too. 2015-01-30 16:46:56 +01:00
Willi Goesgens dabd986fcc Add trailing slash for safety. 2015-01-21 09:35:51 +01:00
Willi Goesgens 7d883f5e9e Add posibility to build relative-enabled binaries with cmake too. 2015-01-19 19:40:04 +01:00
Willi Goesgens b1f881254d Upgrade V8 to 3.31.74.1 2015-01-19 19:29:31 +01:00
Frank Celler ec6f2a41ae fixed destination path 2014-12-26 11:42:34 +01:00
Frank Celler 60510f7431 copy icudtl.dat 2014-12-26 10:58:19 +01:00
Frank Celler 013671527e fixed paths 2014-12-24 12:51:20 +01:00
Frank Celler 02252575d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-24 10:59:38 +01:00
Frank Celler 06e09f607e fixed version info for cmake 2014-12-24 10:59:33 +01:00
Frank Celler 44e23d8e4f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-24 10:58:25 +01:00
Frank Celler 7bb196abfe fixed libraries 2014-12-24 10:56:14 +01:00
Frank Celler 2d92e15497 removed TRI_ICU_VERSION 2014-12-24 09:01:36 +01:00
Frank Celler c0377c7bde fixed pathes 2014-12-24 08:26:54 +01:00
Frank Celler 28bcbce68b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-24 00:39:36 +01:00
Frank Celler 2e4af7e46a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-24 00:30:45 +01:00
Frank Celler 67bfa2901e windows adjustments 2014-12-24 00:30:29 +01:00
Frank Celler 331314be97 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-23 23:44:24 +01:00
Frank Celler f34aabe87a removed all-in-one, fixed path 2014-12-23 23:44:08 +01:00
Frank Celler 8b1d2830d7 added -DTRI_FORCE_ARMV6 for raspberry 2014-12-23 17:24:57 +01:00
Frank Celler 26b6885a86 fixed MacOSX 2014-12-19 09:51:05 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Frank Celler 3ac1d0b336 fixed issue 1028: libicu is now statically linked 
Conflicts:
	CHANGELOG
 2014-10-15 22:22:59 +02:00
Jan Steemann ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +02:00
Frank Celler bc14c0ce46 moved install files to obs 2014-06-04 12:23:25 +02:00
Max Neunhoeffer d70353fce0 Add usage of libdl for arangob in CMakeLists.txt under Linux. 2014-05-22 11:37:08 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Achim Brandt 92d525994e added c++11 for gcc and apple 2014-04-25 14:00:16 +02:00
Esteban Lombeyda ca24738abe WARNING LNK4099 is ignored 2014-03-27 16:05:24 +01:00
Frank Celler f053670ecc fixed install for etcd 2014-03-20 12:01:43 +01:00
Esteban Lombeyda e9a847ef37 Bug Fix: correct path for icons 2014-03-14 09:31:56 +01:00
Frank Celler 0684d0bda4 added vista locks 
Conflicts:
	GNUmakefile
	lib/BasicsC/locks-win32.c
	lib/BasicsC/locks-win32.h
 2014-03-05 14:22:27 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
 2014-02-28 20:37:05 +01:00
Esteban Lombeyda 05daddaf1d only arango icons are exported in to installation directory 
SimpleService Plugin was copied in to project directory in order to allow
an automatic build of arango under windows
 2014-02-28 18:27:53 +01:00
Esteban Lombeyda 867ca86dac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CMakeLists.txt
 2014-02-28 10:28:22 +01:00
Esteban Lombeyda bd15248198 using paths correct paths, starting as service 2014-02-25 16:50:47 +01:00
Max Neunhoeffer cc75da03dd Get rid of switch --enable-cluster. 
Always compile with TRI_ENABLE_CLUSTER enabled.
 2014-02-25 12:46:10 +01:00
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-02-19 10:21:00 +01:00
Frank Celler da7d64bba9 removed wow6432 hack 2014-02-19 10:13:30 +01:00
Heiko Kernbach b69fad0381 merge origin/devel 2014-02-18 14:29:44 +01:00
Esteban Lombeyda bd83372050 Bug Fixes: RegKey are written into correct Directories 
Default Directories are correct displayed
 2014-02-18 13:14:57 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Frank Celler 73f2be8a33 removed check-server 2014-02-15 23:34:24 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Esteban Lombeyda e958f6052a Icon Bug fix 2014-02-14 15:12:12 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Esteban Lombeyda bc27084a2d Inserting arango executables into start menu (windows) 2014-01-29 16:04:04 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +01:00
Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	GNUmakefile
	Makefile.in
	VERSION
	arangod/V8Server/ApplicationV8.cpp
	build.h
	configure
	configure.ac
	js/actions/api-foxx.js
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	lib/BasicsC/locks-win32.c
 2014-01-16 08:53:31 +01:00
Frank Celler c890caf260 fixed typos in windows parts 2014-01-16 08:40:36 +01:00
Frank Celler 94d6523b87 precompiled libs 2014-01-03 16:20:20 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 190fa461d6 fixed regexp for arm 2013-12-24 02:15:46 +01:00
Frank Celler ad7385909e removed foxx-manager and arango-dfdb shell scripts, removed uid config file 2013-12-23 17:11:10 +01:00
Frank Celler 7e30dc0b4e MacOS bundle 2013-12-23 16:03:38 +01:00
Frank Celler da8f9098a2 windows installer 2013-12-23 12:48:35 +01:00
Frank Celler 9b49d60b0a fixed concatenate files 2013-12-22 12:45:54 +01:00
Frank Celler 83d49223d5 added readme for windows 2013-12-22 11:34:05 +01:00
Frank Celler 4f0d9f5b71 install Windows binaries all in bin 2013-12-21 13:10:08 +01:00
Frank Celler 85c780fbbe added icon path and more nsis info 2013-12-16 12:18:02 +01:00
Frank Celler 35af9593a4 fixed wrong path in install script 2013-12-07 18:56:14 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Frank Celler 8a4a08ed84 fixed issue #681: Problem with ArchLinux PKGBUILD configuration 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	etc/arangodb/arangod.conf.in
	utils/arango-dfdb.in
 2013-11-22 21:58:52 +01:00
Frank Celler cdb0d693b2 fixed issue #681: Problem with ArchLinux PKGBUILD configuration 2013-11-22 21:45:52 +01:00
Frank Celler 914bd38cfc added check-sever 2013-11-20 09:21:22 +01:00
Frank Celler eee23de5e0 fixed Mac build 
Conflicts:
	Makefile.in
 2013-11-09 13:00:21 +01:00
Frank Celler 3fef8ed585 fixed Mac build 2013-11-09 12:59:24 +01:00
Frank Celler 837830b346 strip files 2013-11-07 14:15:54 +01:00
Frank Celler 29aee6a6d5 strip files 2013-11-07 13:15:01 +00:00
Frank Celler a68a5d7fa9 fixed wrong replace for SYSCONFDIR, fixed wrong config file 2013-11-07 11:04:54 +00:00
Frank Celler d5d56cc5f6 fixed hash bang and test 2013-11-06 22:29:08 +00:00
Frank Celler 8856a93455 fixed permissions 2013-11-06 16:03:47 +00:00
Frank Celler a18beb9741 generated arm conf files 2013-11-06 16:49:16 +01:00
Frank Celler 0d844c3f06 generated arm conf files 2013-11-06 16:44:46 +01:00
Frank Celler 11683a60a2 added debian 2013-11-02 22:16:43 +01:00
Frank Celler 10da35494d added contact 2013-11-02 17:41:24 +00:00
Frank Celler 96d3c32cb7 added startup script 2013-10-27 20:14:48 +01:00
Frank Celler 8922656eab fixed var 2013-10-26 20:25:31 +02:00
Frank Celler 238d9b4b51 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-10-26 16:49:38 +02:00
Frank Celler 6dade2c4ee cosmetics 2013-10-26 16:49:32 +02:00
Frank Celler b294240fda moved to icu 52.1 for Mavericks 2013-10-26 15:50:43 +02:00
Frank Celler 4d3045e060 cmake 2013-10-26 09:45:27 +02:00
Frank Celler d620386a7b added tests 2013-10-20 18:46:40 +02:00
Frank Celler 9ced80a889 mruby and output 2013-10-20 14:08:26 +02:00
Frank Celler d82b95d028 added arangod 2013-10-20 13:12:48 +02:00
Frank Celler 28b711a53b added mruby 2013-10-20 12:51:54 +02:00
Frank Celler f52d02f8d3 more cmake 2013-10-20 12:18:05 +02:00
Frank Celler d868171b46 more tests with cmake 2013-10-20 10:52:24 +02:00
Frank Celler 0a0bb534c3 added first attempt for cmake 2013-10-18 17:29:33 +02:00