rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

Updated fullCalendar to 2.9.1

Browse Source 
+ fix using moment-timezone with webpack
This commit is contained in:
Sylvain 2020-09-28 17:33:18 +02:00
parent e68397d0c5
commit 62e45dc998
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
- Updated jquery-minicolors to 2.3.5
- Updated angular-bootstrap-switch to 0.5.2
- Updated bootstrap-switch to 3.4.0
- Updated fullCalendar to 2.9.1
## v4.5.6 2020 September 1st

5
app/frontend/src/javascript/app.js
View File

@ -8,7 +8,6 @@
// eslint-disable-next-line no-use-before-define
var Application = Application || {};
Application.Constants = angular.module('application.constants', []);
Application.Services = angular.module('application.services', []);
Application.Controllers = angular.module('application.controllers', []);
Application.Filters = angular.module('application.filters', []);
@ -16,7 +15,7 @@ Application.Directives = angular.module('application.directives', []);
angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.router', 'ui.bootstrap',
'ngUpload', 'duScroll', 'application.filters', 'application.services', 'application.directives',
'frapontillo.bootstrap-switch', 'application.constants', 'application.controllers', 'application.router',
'frapontillo.bootstrap-switch', 'application.controllers', 'application.router',
'ui.select', 'ui.calendar', 'angularMoment', 'Devise', 'angular-growl', 'xeditable',
'checklist-model', 'unsavedChanges', 'angular-loading-bar', 'ngTouch', 'angular-google-analytics',
'angularUtils.directives.dirDisqus', 'summernote', 'elasticsearch', 'angular-medium-editor', 'naif.base64',
@ -141,7 +140,7 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout
};
}]).constant('angularMomentConfig', {
timezone: Fablab.timezone
});
}).constant('moment', require('moment-timezone'));
angular.isUndefinedOrNull = function (val) {
return angular.isUndefined(val) || val === null;

2
app/frontend/src/javascript/services/calendar.js
View File

@ -32,7 +32,7 @@ Application.Services.factory('CalendarConfig', [() =>
agenda: 'H:mm',
month: 'H(:mm)'
},
axisFormat: 'H:mm',
slotLabelFormat: 'H:mm',
allDaySlot: false,
defaultView: 'agendaWeek',

4
package.json
View File

@ -61,7 +61,7 @@
"angular-translate-interpolation-messageformat": "2.18",
"angular-translate-loader-partial": "2.18",
"angular-ui-bootstrap": "1.2.5",
"angular-ui-calendar": "https://github.com/angular-ui/ui-calendar.git#1.0.1",
"angular-ui-calendar": "^1.0.2",
"angular-ui-codemirror": "^0.3.0",
"angular-ui-tour": "https://github.com/Ross-Byrne/angular-ui-tour.git#master",
"angular-unsavedchanges": "0.2",
@ -72,7 +72,7 @@
"codemirror": "^4.8.0",
"d3": "3.5",
"elasticsearch-browser": "3.1",
"fullcalendar": "2.3.1",
"fullcalendar": "2.9.1",
"holderjs": "2.6",
"jasny-bootstrap": "3.1",
"jquery": ">=3.5.0",

34
yarn.lock
View File

@ -1346,9 +1346,10 @@ angular-ui-bootstrap@1.2.5:
resolved "https://registry.yarnpkg.com/angular-ui-bootstrap/-/angular-ui-bootstrap-1.2.5.tgz#b0c1eff0bf3b7a65668984a1b81820a90dc60995"
integrity sha1-sMHv8L87emVmiYShuBggqQ3GCZU=
"angular-ui-calendar@https://github.com/angular-ui/ui-calendar.git#1.0.1":
version "1.0.1"
resolved "https://github.com/angular-ui/ui-calendar.git#f0ab8e186da6b946eafa12ab4154578c1fdf1e1d"
angular-ui-calendar@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/angular-ui-calendar/-/angular-ui-calendar-1.0.2.tgz#fa271057425572efaadf6660243cc33cb99f33c1"
integrity sha1-+icQV0JVcu+q32ZgJDzDPLmfM8E=
angular-ui-codemirror@^0.3.0:
version "0.3.0"
@ -3895,10 +3896,10 @@ fstream@^1.0.0, fstream@^1.0.12:
mkdirp ">=0.5 0"
rimraf "2"
fullcalendar@2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-2.3.1.tgz#c0ac58eb9dfa733bf1757e3b7cdabb4436a219bf"
integrity sha1-wKxY6536czvxdX47fNq7RDaiGb8=
fullcalendar@2.9.1:
version "2.9.1"
resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-2.9.1.tgz#dd2a84469b627749e47c5dd9fd71f56146e0651b"
integrity sha1-3SqERptid0nkfF3Z/XH1YUbgZRs=
dependencies:
jquery ">=1.7.1"
moment ">=2.5.0"
@ -4906,16 +4907,16 @@ jquery-ujs@^1.2.2:
dependencies:
jquery ">=1.8.0"
jquery@>=1.7.1, jquery@>=1.9.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
jquery@>=1.8.0, jquery@>=3.5.0:
jquery@>=1.7.1, jquery@>=1.8.0, jquery@>=3.5.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
jquery@>=1.9.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
js-base64@^2.1.8:
version "2.6.4"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
@ -5561,7 +5562,7 @@ moment-timezone@0.5:
dependencies:
moment ">= 2.9.0"
moment@2.22, moment@>=2.5.0, "moment@>=2.8.0 <3.0.0":
moment@2.22, "moment@>=2.8.0 <3.0.0":
version "2.22.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
@ -5571,6 +5572,11 @@ moment@2.22, moment@>=2.5.0, "moment@>=2.8.0 <3.0.0":
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
moment@>=2.5.0:
version "2.29.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.0.tgz#fcbef955844d91deb55438613ddcec56e86a3425"
integrity sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==
move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"