mirror of
https://github.com/grocy/grocy.git
synced 2025-08-18 19:37:12 +00:00
Squashed commit
Updated dependencies Added the possibility to skip chore schedules (closes #1486) Show the meal plan section on the corresponding calendar events (closes #1582) Make it possible to define a time for meal plan sections and use that time for the corresponding calendar events (references #1582) Added a changelog template Make it possible to toggle the meal plan calendar view on bigger screens (closes #1678)
This commit is contained in:
@@ -205,5 +205,10 @@ function CleanFileName(fileName)
|
||||
|
||||
function nl2br(s)
|
||||
{
|
||||
if (s == null || s === undefined)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
return s.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, "$1<br>$2");
|
||||
}
|
||||
|
@@ -393,6 +393,7 @@ Grocy.FrontendHelpers.ValidateForm = function(formId)
|
||||
if (form.checkValidity() === true)
|
||||
{
|
||||
$(form).find(':submit').removeClass('disabled');
|
||||
$(form).find('.keep-disabled').addClass('disabled');
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user