Merge branch '0.10' of https://github.com/openlightingproject/ola into 0.10-c11-compat

Author: peternewman

AUTHORS

@@ -21,6 +21,7 @@ Contributors:
   Masaki Muranaka, various patches
   Nicolas, for the win32 port of libartnet
   Nils Van Zuijlen, typos and python lib small update
+  Perry Naseck, EPoll delay fix
   Peter Newman, MilInst Plugin, Scanlime Fadecandy support and numerous fixes
   Ravindra Nath Kakarla, RDM Test Server (Google Summer of Code 2012)
   Rowan Maclachlan (hippy) for various changes

common/io/EPoller.cpp

@@ -311,8 +311,10 @@ bool EPoller::Poll(TimeoutManager *timeout_manager,
   }
 
   int ms_to_sleep = sleep_interval.InMilliSeconds();
+  // If we haven't been asked to wait as part of the poll interval, then don't
+  // wait in the epoll to allow for fast streaming
   int ready = epoll_wait(m_epoll_fd, reinterpret_cast<epoll_event*>(&events),
-                         MAX_EVENTS, ms_to_sleep ? ms_to_sleep : 1);
+                         MAX_EVENTS, ms_to_sleep ? ms_to_sleep : 0);
 
   if (ready == 0) {
     m_clock->CurrentMonotonicTime(&m_wake_up_time);

javascript/new-src/bower.json

@@ -7,9 +7,9 @@
   "license": "GPL",
   "private": true,
   "dependencies": {
-    "angular": "~1.3.14",
+    "angular": "~1.8.3",
     "bootstrap": "~3.3.1",
-    "angular-route": "~1.3.14"
+    "angular-route": "~1.8.3"
   },
   "exportsOverride": {
     "angular": {

javascript/new-src/package.json

@@ -3,13 +3,13 @@
   "license": "GPL-2.0+",
   "repository": "OpenLightingProject/ola",
   "devDependencies": {
-    "olp-javascript-style": "OpenLightingProject/javascript-style",
     "grunt": "~0.4.5",
     "grunt-bower-task": "^0.4.0",
     "grunt-contrib-cssmin": "^0.11.0",
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^0.7.0",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-jscs": "^1.8.0"
+    "grunt-jscs": "^1.8.0",
+    "olp-javascript-style": "OpenLightingProject/javascript-style"
   }
 }

javascript/new-src/src/app.js

@@ -20,6 +20,15 @@
 /* global angular */
 var ola = angular.module('olaApp', ['ngRoute']);
 
+// AngularJS 1.6 now uses an '!' as the default hashPrefix, breaking
+// our routes. Following lines revert the default to the previous empty
+// string.
+// See https://docs.angularjs.org/guide/migration#commit-aa077e8
+ola.config(['$locationProvider', function($locationProvider) {
+  'use strict';
+  $locationProvider.hashPrefix('');
+}]);
+
 ola.config(['$routeProvider',
   function($routeProvider) {
     'use strict';