1
0
Fork 0
Commit Graph

41 Commits

Author SHA1 Message Date
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