rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-06 01:08:21 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Sylvain 2016-09-27 10:45:07 +02:00
parent 24a0f5533c
commit 1195451863
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -40,7 +40,6 @@
- Display strategy's name in SSO providers list - Display strategy's name in SSO providers list
- SSO: documentation improved with an usage example - SSO: documentation improved with an usage example
- SSO: mapped fields display their data type. Integers, booleans and dates allow some transformations. - 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: project drafts are shown on public profiles
- Fix a bug: event category disappear when editing the event - Fix a bug: event category disappear when editing the event
- Fix a bug: machine name is not shown in plan edition - 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` - [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) - [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 ## v2.3.0 2016 June 28
- Public API with access management and online documentation - Public API with access management and online documentation

5
app/assets/javascripts/controllers/admin/invoices.coffee.erb
View File

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

4
app/assets/templates/machines/show.html.erb
View File

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

2
app/assets/templates/trainings/show.html.erb
View File

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