1
0
Fork 0
Commit Graph

13022 Commits

Author SHA1 Message Date
Jan Steemann 3f6d28de8d fixed VS warnings 2014-05-13 12:44:00 +02:00
Jan Steemann e40a9f203a added new features and upgrade notes for 2.1 2014-05-12 22:52:45 +02:00
Jan Steemann 911f10cb52 included correct init header 2014-05-12 18:06:49 +02:00
Jan Steemann 6011994329 added atomic header 2014-05-12 18:05:25 +02:00
Jan Steemann 594c5c3a3c use atomics 2014-05-12 18:00:55 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann ed50f3656d added unordered_map and unordered_set 2014-05-12 17:09:26 +02:00
Jan Steemann b96b7d489c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-12 16:50:33 +02:00
Jan Steemann 401c8f8192 do not pass 0 to ctor 2014-05-12 16:50:17 +02:00
Esteban Lombeyda d1a672cb7e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-12 16:49:18 +02:00
Esteban Lombeyda 9c1d39c1f4 Some Windows Warnings are avoided 2014-05-12 16:48:05 +02:00
Jan Steemann c9586d82dc added make jslint to target 2014-05-12 14:45:19 +02:00
Max Neunhoeffer d6373a7f83 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-12 14:28:13 +02:00
Max Neunhoeffer c22ea12b1a Polish job cancellation documentation. 2014-05-12 14:27:40 +02:00
Jan Steemann 4cf29af60a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-12 13:56:12 +02:00
Jan Steemann 204a16c224 fixed compiler warning 2014-05-12 13:55:58 +02:00
scottashton 00a4c8b27e fixed scss bug 2014-05-12 12:55:11 +02:00
scottashton 5b644570d9 fixed scsslint errors 2014-05-12 11:51:26 +02:00
scottashton 1bb91230f0 adjusted tests 2014-05-12 11:02:07 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Jan Steemann 9a45d9379a issue #854: Cleanup collection figures 2014-05-12 09:43:41 +02:00
Jan Steemann c6b67d6dda added 2.1 to travis testing 2014-05-12 09:39:27 +02:00
Jan Steemann a991f0d581 disable turning down scheduler in test mode 2014-05-12 09:29:39 +02:00
Frank Celler 0b52586d33 Merge pull request #858 from fceller/devel
dashboard fixes
2014-05-12 00:49:19 +02:00
Frank Celler e83c7b3a34 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-12 00:44:58 +02:00
Frank Celler c12831a361 fixed interval 2014-05-12 00:44:44 +02:00
Frank Celler 1048559dcf fixed percent 2014-05-12 00:38:03 +02:00
Frank Celler bd2df3b6e3 do not enable cluster 2014-05-12 00:26:09 +02:00
Frank Celler 9127ed2ac5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
2014-05-12 00:07:46 +02:00
Claudius Weinberger 109c6d6304 redesign dashboard 2014-05-11 23:45:36 +02:00
Claudius Weinberger 86cd2a8390 redesign dashboard 2014-05-11 23:43:09 +02:00
Claudius Weinberger 1e32c7a2d2 redesign dashboard 2014-05-11 23:22:41 +02:00
Claudius Weinberger 3740035736 Merge branch 'devel' of github.com:fceller/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
2014-05-11 22:43:48 +02:00
Claudius Weinberger 14256b504e redesign dashboard 2014-05-11 22:42:49 +02:00
Frank Celler a315c7cc16 better history 2014-05-11 22:39:42 +02:00
Frank Celler f676e06dc1 fixed CXX and LINK 2014-05-11 21:19:00 +02:00
Claudius Weinberger cb28bb478a design Dashboard 2014-05-11 20:58:28 +02:00
Claudius Weinberger 22344c9b66 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 15:12:52 +02:00
Claudius Weinberger 71c50b9942 redesign dashbaord 2014-05-11 15:12:27 +02:00
Frank Celler d376c70b20 Merge branch 'devel' of github.com:fceller/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
2014-05-11 15:04:42 +02:00
Frank Celler 7044757739 fixed order (big number on top) 2014-05-11 15:03:31 +02:00
Frank Celler 540130a4b0 fixed cflags 2014-05-11 00:45:52 +02:00
Claudius Weinberger 1b1241f91e Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 00:41:54 +02:00
Claudius Weinberger ea487051c4 redesign dashboard 2014-05-11 00:41:36 +02:00
Frank Celler d1172f7f48 added cutoff 2014-05-11 00:16:42 +02:00
Claudius Weinberger 9252bb8629 redesign dashboard 2014-05-10 22:31:17 +02:00
Claudius Weinberger 67672b8492 redesign Dashboard 2014-05-10 21:35:19 +02:00
Frank Celler d46420f2a8 cleanup of flags 2014-05-10 20:10:25 +02:00
Frank Celler cd892deca8 fixed flags 2014-05-10 19:39:35 +02:00
Frank Celler 5fc34f85be fixed flags 2014-05-10 18:58:48 +02:00