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

34496 Commits

Author SHA1 Message Date
hkernbach 4f3c33eee7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-13 10:58:31 +02:00
hkernbach cc879f50e1 semistandard 2016-10-13 10:58:22 +02:00
Max Neunhoeffer b993de3c42 Fix performRequests? 2016-10-13 10:57:29 +02:00
Max Neunhoeffer 3ee28ac333 Adjust comments about TRI_usleep and usleep. 2016-10-13 10:57:00 +02:00
Jan Steemann b99f43935c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-13 10:56:31 +02:00
Jan Steemann 5508ba4a87 fixed compile warning 2016-10-13 10:56:23 +02:00
hkernbach ebb36a6d45 queryview bugfix, color 2016-10-13 10:54:06 +02:00
Jan Steemann 9bd0aa002b added missing legend and color 2016-10-13 10:42:20 +02:00
Jan Steemann d12b52725a "ressources" => "resources" 2016-10-13 10:31:31 +02:00
Jan Steemann e88460efcb add state "loading collections" to query profile results 2016-10-13 10:31:16 +02:00
hkernbach 4150fa7ec7 colors, gv 2016-10-13 10:14:42 +02:00
hkernbach f9f96e765a query view, images 2016-10-13 10:08:54 +02:00
Jan Steemann d229ac3354 performance optimization 2016-10-13 09:15:42 +02:00
Wilfried Goesgens 50f9a21e91 As we wait for arangodb to be up and running, we should also wait for 
its shutdown on deinstall.
 2016-10-12 20:53:56 +02:00
Wilfried Goesgens 0779c44faf f*in with nsis 2016-10-12 20:17:30 +02:00
Joerg Schad cfe2091642 Fixed capitalization in Readme.md 2016-10-12 19:59:45 +02:00
Wilfried Goesgens 5354421273 fix one more typo 2016-10-12 19:39:22 +02:00
Wilfried Goesgens c910f476fe Fix syntax error 2016-10-12 19:06:55 +02:00
Wilfried Goesgens d5b15e2ab5 Work around more cmake / cpack / nsis vodoo 2016-10-12 18:39:05 +02:00
Wilfried Goesgens a6525a8ced Quote strings. 2016-10-12 18:20:13 +02:00
Wilfried Goesgens f7d9042202 Fix names of cmake variables 2016-10-12 18:01:17 +02:00
Wilfried Goesgens bf8da244c2 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-10-12 17:28:30 +02:00
Wilfried Goesgens 84bc6fa8a5 - unify the refernces of the exes and DLLs for windows 
- put them all into bin, else we would have to copy the dlls twice.
 2016-10-12 17:27:10 +02:00
Jan Steemann ed132992ea Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-12 17:00:25 +02:00
Jan Steemann 3b11acbc29 micro optimizations 2016-10-12 16:59:57 +02:00
Alan Plum 764d3b3183
Document the OAuth2 module 
[skip ci]
 2016-10-12 16:43:54 +02:00
Wilfried Goesgens 5cb6b12372 erge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-10-12 16:29:11 +02:00
Wilfried Goesgens 1244cef34a Fix the path of the windows icons + bmps 2016-10-12 16:28:54 +02:00
Max Neunhoeffer 034927fe20 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-12 16:26:48 +02:00
Max Neunhoeffer 2996a375ae Use correct path. 2016-10-12 16:26:15 +02:00
Wilfried Goesgens 5e77540fb0 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-10-12 15:54:45 +02:00
Wilfried Goesgens 985e48eace Adjust paths to new directory structure for windows too. 2016-10-12 15:54:26 +02:00
hkernbach d0ad61a030 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-12 14:55:00 +02:00
hkernbach 42d28f0708 nodes view 2016-10-12 14:54:49 +02:00
Max Neunhoeffer 300066f376 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-12 14:39:24 +02:00
Max Neunhoeffer 4676c5b250 More logging in case of strange timeouts. 2016-10-12 14:39:09 +02:00
Max Neunhoeffer b933900954 Different agents log in different files. 2016-10-12 14:25:37 +02:00
Wilfried Goesgens 4058ab3c65 Fix syntax error for windows 2016-10-12 14:23:22 +02:00
Wilfried Goesgens a817a69162 Fix windows config paths for the PKGDATADIR 2016-10-12 14:17:00 +02:00
Wilfried Goesgens ae6261902e Fix windows compile 2016-10-12 14:10:28 +02:00
Wilfried Goesgens 75a2301a95 Remove debugging 2016-10-12 14:00:06 +02:00
Wilfried Goesgens a23aeefbd9 Another place we need the binaryPath for windows 2016-10-12 13:56:32 +02:00
Jan Steemann f9fe5387bf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-12 13:37:38 +02:00
Jan Steemann 958379dce3 cppcheck 2016-10-12 13:37:27 +02:00
Wilfried Goesgens e6f505ebe0 Fix windows compile 2016-10-12 13:27:59 +02:00
Michael Hackstein 2cfa417ac7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-12 13:26:57 +02:00
Michael Hackstein 6ac0f848c5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-12 13:26:43 +02:00
Jan Steemann fc36d0e220 fix compile warning 2016-10-12 13:26:32 +02:00
Michael Hackstein 13dc4915f8 Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs 2016-10-12 13:25:56 +02:00
Wilfried Goesgens 3ad8226cd8 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-10-12 13:22:21 +02:00