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

11742 Commits

Author SHA1 Message Date
gschwab 637e1bbc66 fixed some tests 2014-03-11 10:11:06 +01:00
Max Neunhoeffer dccf081a60 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-11 09:33:17 +01:00
Max Neunhoeffer a70c082a0d Quote a string correctly for Windows. 2014-03-11 09:32:57 +01:00
Jan Steemann e069d0737b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 09:03:57 +01:00
Jan Steemann 3e8e6a76be report sizeof void* 2014-03-11 09:03:32 +01:00
Frank Celler 6ea76eeb9c new bison 3 2014-03-10 19:24:28 +01:00
Frank Celler 1d9c133bf9 fixed warning 2014-03-10 19:24:06 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Jan Steemann ee0916deb8 updated CHANGELOG 2014-03-10 16:56:35 +01:00
Jan Steemann 3c88e45802 fixed too eager compaction 
Conflicts:
	CHANGELOG
	arangod/VocBase/compactor.c
 2014-03-10 16:55:15 +01:00
Max Neunhoeffer d178ec939c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 15:40:40 +01:00
Max Neunhoeffer 5110b45c26 Change Windows version to pass SOCKET handles to libev. 
One has to use the corresponding change in the ArangoDB-Windows
repository as well, where libev is patched for this purpose.
 2014-03-10 15:38:03 +01:00
gschwab 68109fa2b9 some small scss refactorings 2014-03-10 14:41:56 +01:00
gschwab 7cf458a77d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 13:10:16 +01:00
gschwab 96aa5f0b26 fixed icon-size of query/result view 2014-03-10 13:10:08 +01:00
Frank Celler 92cbfb5679 remove etcd on clean 2014-03-10 11:05:44 +01:00
Jan Steemann 54599b86e7 removed documentation for test methods 2014-03-10 10:30:43 +01:00
Jan Steemann a11811dfdd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 10:30:08 +01:00
Jan Steemann 1dc2f55666 added missing API documentation for HTTP GET `/_admin/server/role` 2014-03-10 10:29:51 +01:00
Max Neunhoeffer 48a7ee708e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-10 10:21:44 +01:00
Max Neunhoeffer 24e7293dba Split shell-any tests to save time on the cluster. 2014-03-10 10:21:28 +01:00
Jan Steemann cb0e6fa4d2 fixed return value of `make jslint` 2014-03-10 09:37:23 +01:00
Jan Steemann f3b755b6f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 09:28:51 +01:00
Jan Steemann 784c54718c fixed return value of `make jslint` 2014-03-10 09:28:43 +01:00
gschwab b4f2c2b92d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 09:26:33 +01:00
gschwab 605dc9c5bf added tooltip for gravatar 2014-03-10 09:26:26 +01:00
Jan Steemann 117af36b25 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-10 09:03:34 +01:00
gschwab a61c7bb713 deleted duplicate of bootstrap.js 2014-03-10 08:43:24 +01:00
Michael Hackstein ad8e6cf172 SCSS-Lint fix 2014-03-09 09:06:23 +01:00
Michael Hackstein 55b1713dbf Fixed JSLint warnings 2014-03-09 08:32:34 +01:00
Michael Hackstein b07c01a1f9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-08 22:28:59 +01:00
Michael Hackstein 34bafb61ec Removed unused files from karma configuration 2014-03-08 22:28:54 +01:00
Jan Steemann 3d4b7931a8 issue #776: update compilation instructions 2014-03-07 20:29:48 +01:00
Jan Steemann a48a61de0c added empty files to distribution to avoid loading of old files 2014-03-07 18:16:17 +01:00
Jan Steemann 4af498d0a9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 17:24:29 +01:00
Jan Steemann 46ec0024dc fixed invalid variable name 2014-03-07 17:24:16 +01:00
gschwab ecf1a0b492 fixed tile layout 2014-03-07 17:18:06 +01:00
gschwab 1bf03dc11f fixed search bar layout 2014-03-07 17:07:34 +01:00
gschwab a3f449f62a generated new cluster.css 2014-03-07 17:01:32 +01:00
gschwab c06ea80ee9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 16:58:34 +01:00
gschwab cac2d5109e fixed most of scss 2014-03-07 16:58:27 +01:00
Max Neunhoeffer ccb037a4d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 16:48:46 +01:00
Max Neunhoeffer cd0a33de9f Seemingly fix behaviour on Windows. 
Note: WSACleanup complains and we do not know a fix.
 2014-03-07 16:48:21 +01:00
Jan Steemann 41341f3023 fixed jslint warnings 2014-03-07 16:30:04 +01:00
Max Neunhoeffer e19e72bcec Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 16:20:34 +01:00
Max Neunhoeffer 6206f91d56 Yet another fix for process shutdown on Unix. 2014-03-07 16:20:12 +01:00
gschwab afdd30a717 fixed gravatar input 2014-03-07 16:07:26 +01:00
Michael Hackstein cdf2552d93 Fixed merge conflicts and fixed scss conflicts 
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-07 15:26:10 +01:00
Michael Hackstein db31aec469 Generated css 2014-03-07 15:16:03 +01:00
Michael Hackstein 5f52ccb377 SCSS_lint fixes finished 2014-03-07 15:13:31 +01:00