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

11605 Commits

Author SHA1 Message Date
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
Jan Steemann 5ebdc7d307 fixed "cannot convert value to JSON" error 2014-03-04 16:21:40 +01:00
Max Neunhoeffer ef474bde11 Quote string in server tests for Windows backslashes. 2014-03-04 16:21:30 +01:00
Michael Hackstein 3d5456820f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 15:37:51 +01:00
Michael Hackstein 169b3f3138 Last second style fixes 2014-03-04 15:37:47 +01:00
gschwab 87e5bf0bc3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 15:28:26 +01:00
gschwab 7d7fadd329 fixed broken link 2014-03-04 15:28:20 +01:00
Frank Celler ae61ed7b53 changed title 2014-03-04 15:16:54 +01:00
Frank Celler 5430067dd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 13:55:52 +01:00
Frank Celler adef69b625 fixed header 2014-03-04 13:55:44 +01:00
gschwab ba55aefc3a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 13:54:54 +01:00
Frank Celler cce0f9f99e added cluster pic 2014-03-04 13:54:38 +01:00
gschwab 98e79e273b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 13:53:18 +01:00
gschwab b31004300e deleted inline css 2014-03-04 13:53:13 +01:00
scottashton 0bfca1649c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 13:33:12 +01:00
scottashton 6fb391eb3f jslint hints fixed 2014-03-04 13:32:39 +01:00
Michael Hackstein 861afb4e5e Fixed merge conflicts 2014-03-04 13:31:41 +01:00
Michael Hackstein 22858b1ac1 It is now also possible to add non sharded collections (which means adding a sharded one with only one key 2014-03-04 13:25:19 +01:00
Michael Hackstein 4d9c8ff9d9 Implemented creation of sharded collections 2014-03-04 13:22:47 +01:00
Michael Hackstein 181c7b72ff Added select2 library and selct box 2014-03-04 13:22:11 +01:00
Max Neunhoeffer 63bcda3c78 Fix a typo for Windows. 2014-03-04 13:13:10 +01:00
Max Neunhoeffer 2044fc9c40 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	lib/BasicsC/process-utils.c
 2014-03-04 12:32:27 +01:00
Max Neunhoeffer dcb2feccd0 Another try to fix process startup under Windows. 2014-03-04 12:31:14 +01:00
gschwab 7a27b61583 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 12:28:48 +01:00
gschwab 4358ed553f deleted inline css 2014-03-04 12:28:43 +01:00
Max Neunhoeffer 57555223ee Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 12:13:07 +01:00
Max Neunhoeffer b21529a725 Report errors under Windows better. 2014-03-04 12:12:52 +01:00
scottashton 44ab5d1398 new method admin/history to fetch the statistics history for single arango, coordinator and dbserv 2014-03-04 12:05:00 +01:00
gschwab 66e8d281fb deleted some unused css, preparing for migration to scss 2014-03-04 11:57:34 +01:00
gschwab 4522443ef8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 11:35:30 +01:00
gschwab 17e34003d5 fixed tooltips 2014-03-04 11:35:25 +01:00
Max Neunhoeffer e652d663bf Fix socket closing under Windows. 2014-03-04 11:23:11 +01:00
Max Neunhoeffer c298863dd1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 10:58:13 +01:00