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

11437 Commits

Author SHA1 Message Date
Jan Steemann e9d2d555af renamed parameter to silence compilers 2014-03-06 10:34:13 +01:00
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
scottashton ff253d0e0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 09:22:39 +01:00
scottashton 7651740d87 fixed bug, detail chart title not showing after reload 2014-03-06 09:22:17 +01:00
Jan Steemann e70948a973 Merge pull request #775 from frankmayer/patch-2 
A few corrections to the text...
 2014-03-06 09:21:33 +01:00
scottashton 1ea001e538 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-06 08:37:18 +01:00
Frank Mayer 3c290a79ed A few corrections to the text... 
Made some minor corrections. Feel free to adopt as is, or pick only the ones you like ;)
 2014-03-05 22:26:47 +02:00
gschwab 199b8865f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 17:05:25 +01:00
gschwab decf96c38c missing closing div-tag inserted 2014-03-05 17:05:20 +01:00
scottashton 437dc5a668 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 16:46:00 +01:00
scottashton 28ef8d5d41 reduced history amount to 14 days 2014-03-05 16:45:57 +01:00
Jan Steemann b1e4554a85 fixed charting bug 2014-03-05 16:38:10 +01:00
scottashton 371c3a84f5 extracted dygraph config 2014-03-05 16:24:55 +01:00
Jan Steemann f5c761c766 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 15:50:36 +01:00
Jan Steemann fb4a445965 updated CHANGELOG 2014-03-05 15:50:23 +01:00
gschwab e827859715 fixed pagination - small refactoring 2014-03-05 15:47:24 +01:00
Jan Steemann 977cc755cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 15:34:00 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
gschwab 3dbf97226e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 14:58:11 +01:00
gschwab c30dceadda fixed pagination on logs 2014-03-05 14:58:04 +01:00
Jan Steemann 3d877549d6 fixed typo 2014-03-05 14:40:36 +01:00
Jan Steemann 569fd6386e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 14:35:25 +01:00
Jan Steemann dee106d58b fixed jslint warning 2014-03-05 14:35:14 +01:00
Frank Celler 81daeb47a7 add missing page, cleanup GNUmakefile 2014-03-05 14:26:38 +01:00
Frank Celler 3d96be0cb2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-05 14:22:47 +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
Jan Steemann 75eed02014 updated manual 2014-03-05 13:12:46 +01:00
Jan Steemann 7664d75e6d prevent usage of _useDatabase() in web interface 2014-03-05 13:04:32 +01:00
Jan Steemann 48b44602ed Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 12:14:46 +01:00
scottashton 8f79530954 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 11:21:21 +01:00
scottashton 11b11412b6 fixed bug jan discovered 2014-03-05 11:20:55 +01:00
Jan Steemann 164394bb9a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 10:47:02 +01:00
Jan Steemann 3451c8a03e fixed createNonce call 2014-03-05 10:46:52 +01:00
Michael Hackstein d7de23a6c9 Fixed JSLint whining 2014-03-05 10:27:14 +01:00
gschwab e2b523f552 added header 2014-03-05 09:45:00 +01:00
gschwab 6c885c886b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-05 09:20:23 +01:00
gschwab 518109fe6d fixed navibar highlighting 2014-03-05 09:20:18 +01:00
Esteban Lombeyda e38906dd21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp
 2014-03-05 09:12:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Frank Celler 71763daff9 fixed images 2014-03-04 20:45:25 +01:00
Jan Steemann c5df003258 add 2.0 to travisCI 2014-03-04 18:47:21 +01:00
Jan Steemann e693a6cdcd updated manual 2014-03-04 18:47:04 +01:00
Jan Steemann 3d647fcccf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 18:46:04 +01:00
Jan Steemann 415055705f adjusted documentation 2014-03-04 18:45:56 +01:00
Jan Steemann e45f4ba20e fix coffee script parse error error 2014-03-04 18:45:40 +01:00
scottashton 0db5f08f52 added detail view to showClusterView and fixed modal bug 2014-03-04 17:15:08 +01:00
Jan Steemann e1a190a51d fixed segfault during test on Windows 2014-03-04 16:58:22 +01:00
Jan Steemann e0953b2ee5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 16:22:14 +01:00
Jan Steemann 1a049e57b9 slightly fixed CHANGELOG 2014-03-04 16:22:06 +01:00
Max Neunhoeffer eea13770e4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 16:21:51 +01:00