Merge branch 'develop' of github.com:ethanhann/IntegrationEngine into develop

ethanhann · ethanhann · commit fe1085b8a6f8 · 2015-02-15T20:44:31.000-05:00
diff --git a/doc/change-log.md b/doc/change-log.md
@@ -5,6 +5,17 @@ currentMenu: change-log
 
 # Change Log
 
+## 2.0.0-rc2
+
+__Chores__
+* Add .net 4 version of Core assembly.
+* Gracefully shutdown Web API to avoid service restart issues.
+* Initialize logger in the type where it is used.
+
+__Fixes__
+* Delete SimpleTrigger from Elasticsearch repo when it is "finalized" by the scheduler. 
+This prevents jobs scheduled with SimpleTriggers from possibly rerunning when the server restarts.
+
 ## 2.0.0-rc1
 
 __Fixes__
diff --git a/doc/couscous.yml b/doc/couscous.yml
@@ -47,7 +47,7 @@ menu:
                     relativeUrl: console-client.html
                 angularjs-api-module:
                     text: AngularJS Client
-                    iconClass: 'fa fa-fw fa-desktop'
+                    iconClass: 'icon ion-social-angular'
                     relativeUrl: angularjs-api-module.html
                 dashboard:
                     text: Web Dashboard
diff --git a/doc/website/bower.json b/doc/website/bower.json
@@ -17,7 +17,8 @@
     "font-awesome": "~4.3.0",
     "highlightjs": "~8.4.0",
     "jquery": "~2.1.3",
-    "bootswatch": "~3.3.2"
+    "bootswatch": "~3.3.2",
+    "ionicons": "~2.0.1"
   },
   "resolutions": {
     "jquery": "~1.11.0"
diff --git a/doc/website/default.twig b/doc/website/default.twig
@@ -3,12 +3,13 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="shortcut icon" href="images/favicon.ico" />
+        <link rel="shortcut icon" href="{{ baseUrl }}/images/favicon.ico" />
 
         <title>{{ title }}</title>
 
         <link rel="stylesheet" href="{{ baseUrl }}/bower_components/bootswatch/paper/bootstrap.min.css">
         <link rel="stylesheet" href="{{ baseUrl }}/bower_components/font-awesome/css/font-awesome.min.css">
+        <link rel="stylesheet" href="{{ baseUrl }}/bower_components/ionicons/css/ionicons.min.css">
         <link rel="stylesheet" href="{{ baseUrl }}/bower_components/highlightjs/styles/dark.css">
         <link rel="stylesheet" href="{{ baseUrl }}/css/main.css">
     </head>
diff --git a/doc/website/home.twig b/doc/website/home.twig
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" href="images/favicon.ico" />
+    <link rel="shortcut icon" href="{{ baseUrl }}/images/favicon.ico" />
 
     <title>{{ title }}</title>
 
