mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-01-19 08:52:25 +01:00
Merge branch 'dev' for release 5.4.7
This commit is contained in:
commit
8a0ddaa0d0
@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
## next deploy
|
## next deploy
|
||||||
|
|
||||||
|
## v5.4.7 2022 June 29
|
||||||
|
|
||||||
|
- Removed the admins' button to scroll to the featured event
|
||||||
|
|
||||||
## v5.4.6 2022 June 27
|
## v5.4.6 2022 June 27
|
||||||
|
|
||||||
- Fix a bug: unable to run yq in deployment scripts
|
- Fix a bug: unable to run yq in deployment scripts
|
||||||
|
@ -95,15 +95,6 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve
|
|||||||
*/
|
*/
|
||||||
$scope.onSingleDay = function (event) { moment(event.start_date).isSame(event.end_date, 'day'); };
|
$scope.onSingleDay = function (event) { moment(event.start_date).isSame(event.end_date, 'day'); };
|
||||||
|
|
||||||
/**
|
|
||||||
* Move down the viewport to the featured event
|
|
||||||
*/
|
|
||||||
$scope.scrollToFeaturedEvent = function () {
|
|
||||||
const card = document.getElementsByClassName('featured-event')[0];
|
|
||||||
if (card) {
|
|
||||||
card.childNodes[0].scrollIntoView({ behavior: 'smooth', block: 'center' });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* PRIVATE SCOPE */
|
/* PRIVATE SCOPE */
|
||||||
|
|
||||||
|
@ -47,9 +47,6 @@
|
|||||||
ui-sref="app.public.events_show({id: featuredEevent.id})">
|
ui-sref="app.public.events_show({id: featuredEevent.id})">
|
||||||
</event-card>
|
</event-card>
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="isAuthorized(['admin', 'manager'])">
|
|
||||||
<button class="btn btn-default" ng-click="scrollToFeaturedEvent()" translate>{{ 'app.public.events_list.show_featured' }}</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ng-repeat="month in monthOrder">
|
<div ng-repeat="month in monthOrder">
|
||||||
<h1>{{monthNames[month.split(',')[0] - 1]}}, {{month.split(',')[1]}}</h1>
|
<h1>{{monthNames[month.split(',')[0] - 1]}}, {{month.split(',')[1]}}</h1>
|
||||||
|
@ -291,7 +291,6 @@ en:
|
|||||||
full_price_: "Full price:"
|
full_price_: "Full price:"
|
||||||
to_date: "to" #eg. from 01/01 to 01/05
|
to_date: "to" #eg. from 01/01 to 01/05
|
||||||
all_themes: "All themes"
|
all_themes: "All themes"
|
||||||
show_featured: "Show the featured event"
|
|
||||||
#details and booking of an event
|
#details and booking of an event
|
||||||
events_show:
|
events_show:
|
||||||
event_description: "Event description"
|
event_description: "Event description"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "fab-manager",
|
"name": "fab-manager",
|
||||||
"version": "5.4.6",
|
"version": "5.4.7",
|
||||||
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
|
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"fablab",
|
"fablab",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user