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

129 Commits

Author SHA1 Message Date
Frank Celler 92172bc59a Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-13 16:38:46 +01:00
Frank Celler 2a731eee62 fixed ctrl-z 2014-02-13 16:25:50 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-13 11:07:01 +01:00
Frank Celler 7a3176ac8d use new readline per default for mac 2014-02-13 11:03:48 +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
Frank Celler 6684b4cbcd fixed warning 2014-01-30 17:36:14 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 9e52c2b866 Windows fixes 2014-01-27 13:34:56 +01:00
Max Neunhoeffer 4f5b8f0462 Try to add boost libraries for shared_ptr. 2014-01-27 11:38:59 +01:00
Max Neunhoeffer cf5af072b8 Sort out "make distclean" to correctly delegate to icu. 2013-11-11 14:37:30 +01:00
Frank Celler 6363d2618c added missing file 2013-10-26 17:09:39 +02:00
Frank Celler b294240fda moved to icu 52.1 for Mavericks 2013-10-26 15:50:43 +02:00
Frank Celler c67f060e2d added modifications for raspberry 2013-10-13 10:48:58 +02:00
Frank Celler 39d8c00b74 removed generated file 2013-10-13 10:48:05 +02:00
Frank Celler f7eafa465f added armv7 2013-10-13 10:47:48 +02:00
Jan Steemann 4473a08461 don't generate pod2man 2013-09-05 14:23:50 +02:00
Jan Steemann 6b84c092eb remove pod2man 2013-08-28 20:44:18 +02:00
Frank Celler 09460a10a3 updated mruby to 2013-08-22 
Conflicts:
	configure
 2013-08-22 21:03:04 +02:00
Jan Steemann b47d661417 do not require pod2man 2013-08-02 19:05:08 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler 37e134ff50 new Foxx 2013-04-04 18:56:38 +02:00
Frank Celler d411d14aed added generated file 2013-03-31 23:32:10 +02:00
Frank Celler fb3e20186a added generated files 2013-03-28 22:32:29 +01:00
Jan Steemann 76a86a853f fixed build? 2013-03-24 10:43:55 +01:00
Jan Steemann fd446bac1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 19:14:02 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Frank Celler 629a519ca7 added gitignore 2013-03-23 16:45:45 +01:00
Frank Celler 4059f31170 return error message 2013-03-23 16:42:52 +01:00
Jan Steemann 1759b7d85a argl 2013-03-23 14:40:31 +01:00
Jan Steemann 189c3d87ec added configure 2013-03-23 14:39:38 +01:00
Jan Steemann d07bee0bde removed generated files 2013-03-23 14:26:36 +01:00
Jan Steemann 1dfc90bf0d added zlib 2013-03-23 14:24:01 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo) 
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
 2013-03-11 09:49:58 +01:00
Frank Celler dd96bb4abd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-03 22:40:55 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
Jan Steemann b6b60b487e removed CVS info 2013-03-01 12:04:11 +01:00
a-brandt e1502f5b81 added CFLAGS and CXXFLAGS 2013-02-27 13:14:56 +01:00
a-brandt b2f6d76dbe added werror=no to avoid too many errors 2013-02-19 15:52:38 +01:00
Jan Steemann 0585fa2e1d updated v8 version from 3.9.4 to 3.16.14.1 2013-02-18 15:03:02 +01:00
Frank Celler 2debef13f7 added more cleanup for 3rd party, see issue #269: fix make distclean & clean 2012-11-27 13:28:47 +01:00
Jan Steemann de13092bc1 issue #241 2012-10-15 10:23:53 +02:00
Frank Celler 1f96f6baaa removed generated files 2012-10-11 20:37:41 +02:00
Frank Celler 160b6a3661 using standard name 2012-10-11 19:14:05 +02:00
Frank Celler c293543011 cleanup of .gitignore 2012-10-11 16:18:53 +02:00
Jan Steemann afc80f51cd removed unneeded protobuf makefile 2012-10-11 15:59:43 +02:00
Frank Celler 27cf9d9b04 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	3rdParty/Makefile.all-in-one-zeromq
	Makefile.in
	js/actions/system/api-blueprint.js
	js/actions/system/api-system.js
 2012-10-11 14:33:31 +02:00
Jan Steemann ee6da07841 fixed compile warning 2012-09-26 12:51:13 +02:00
Jan Steemann 27dc95dd35 removed dependency on boost library 2012-09-24 19:11:38 +02:00
Jan Steemann 1726e46a27 hopefully this time it will be deleted 2012-09-24 17:35:50 +02:00
Jan Steemann a3dee04647 removed zeromq 2012-09-24 15:27:27 +02:00