[bug] embedded video not working in tranings/machines descriptions

CHANGELOG.md

@@ -40,7 +40,6 @@
 - Display strategy's name in SSO providers list
 - SSO: documentation improved with an usage example
 - SSO: mapped fields display their data type. Integers, booleans and dates allow some transformations.
-- Fix a bug: group cache filename too long
 - Fix a bug: project drafts are shown on public profiles
 - Fix a bug: event category disappear when editing the event
 - Fix a bug: machine name is not shown in plan edition 
@@ -57,6 +56,10 @@
 - [TODO DEPLOY] add `EXCEL_DATE_FORMAT` environment variable in `application.yml`
 - [OPTIONAL] `rake fablab:fix:assign_category_to_uncategorized_events` (will put every non-categorized events into a new category called "No Category", to ease re-categorization)
 
+## v2.3.1 2016 September 26
+
+- Fix a bug: group cache filename too long
+
 ## v2.3.0 2016 June 28
 
 - Public API with access management and online documentation

app/assets/javascripts/controllers/admin/invoices.coffee.erb

@@ -133,8 +133,9 @@ Application.Controllers.controller "InvoicesController", ["$scope", "$state", 'I
       sample = sample.replace(/X\[([^\]]+)\]/g, (match, p1, offset, string) ->
         p1
       )
-      # information about wallet (W[text]) - does not apply here
-      sample = sample.replace(/W\[([^\]]+)\]/g, "")
+      # # information about wallet (W[text]) - does not apply here
+      # sample = sample.replace(/W\[([^\]]+)\]/g, "")
+
       # information about refunds (R[text]) - does not apply here
       sample = sample.replace(/R\[([^\]]+)\]/g, "")
     sample

app/assets/templates/machines/show.html.erb

@@ -34,7 +34,7 @@
           <img ng-src="{{machine.machine_image}}" alt="{{machine.name}}" class="img-responsive">
         </div>
 
-        <p class="intro" ng-bind-html="machine.description | breakFilter"></p>
+        <p class="intro" ng-bind-html="machine.description | toTrusted"></p>
 
       </div>
 
@@ -48,7 +48,7 @@
         </div>
         <div class="widget-content no-bg wrapper">
           <h3></h3>
-          <p ng-bind-html="machine.spec"></p>
+          <p ng-bind-html="machine.spec | toTrusted"></p>
         </div>
       </div>
 

app/assets/templates/trainings/show.html.erb

@@ -32,7 +32,7 @@
           <img ng-src="{{training.training_image}}" alt="{{training.name}}" class="img-responsive">
         </div>
 
-        <p class="intro" ng-bind-html="training.description | breakFilter"></p>
+        <p class="intro" ng-bind-html="training.description | toTrusted"></p>
 
       </div>