mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-26 20:54:21 +01:00
Merge branch 'dev' for release 6.3.30
This commit is contained in:
commit
18f6c52171
@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
## Next release
|
## Next release
|
||||||
|
|
||||||
|
## v6.3.30 2024 July 19
|
||||||
|
|
||||||
|
- Fix a bug: unable to change training reservation slot to another slot
|
||||||
|
|
||||||
## v6.3.29 2024 July 19
|
## v6.3.29 2024 July 19
|
||||||
|
|
||||||
- updates chinese translations and adds translations
|
- updates chinese translations and adds translations
|
||||||
|
@ -393,7 +393,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$tra
|
|||||||
*/
|
*/
|
||||||
const refreshCalendar = function () {
|
const refreshCalendar = function () {
|
||||||
$scope.eventSources.splice(0, 1, {
|
$scope.eventSources.splice(0, 1, {
|
||||||
url: `/api/availabilities/trainings/${$transition$.params().id}`,
|
url: `/api/availabilities/trainings/${$transition$.params().id}?member_id=${$scope.ctrl.member.id}`,
|
||||||
textColor: 'black'
|
textColor: 'black'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "fab-manager",
|
"name": "fab-manager",
|
||||||
"version": "6.3.29",
|
"version": "6.3.30",
|
||||||
"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