iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #659 from weeman1337/feature/630-mo-first-day-of-week 

Sets Monday as first day of the week
This commit is contained in:
Igor Scheller 2019-10-12 00:39:28 +02:00 committed by GitHub
parent 91eae7d067 ddaba23c9a
commit 592222c401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -19,7 +19,7 @@
"eonasdan-bootstrap-datetimepicker": "^4.17.47", "eonasdan-bootstrap-datetimepicker": "^4.17.47",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"jquery-ui": "^1.11.2", "jquery-ui": "^1.11.2",
"moment": "^2.8.2", "moment": "^2.12.0",
"moment-timezone": "^0.4.0", "moment-timezone": "^0.4.0",
"select2": "^4.0.6-rc.1", "select2": "^4.0.6-rc.1",
"select2-bootstrap-theme": "0.1.0-beta.10" "select2-bootstrap-theme": "0.1.0-beta.10"

7
resources/assets/js/vendor.js
View File

@ -10,6 +10,13 @@ require('./forms');
require('./sticky-headers'); require('./sticky-headers');
require('./moment-countdown'); require('./moment-countdown');
moment.updateLocale('en', {
week : {
dow : 1, // Monday is the first day of the week.
doy : 4 // The week that contains Jan 4th is the first week of the year.
}
});
$.ajaxSetup({ $.ajaxSetup({
headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')} headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}
}); });

2
yarn.lock
View File

@ -3328,7 +3328,7 @@ moment-timezone@^0.4.0:
dependencies: dependencies:
moment ">= 2.6.0" moment ">= 2.6.0"
"moment@>= 2.6.0", moment@^2.10, moment@^2.10.2, moment@^2.8.2: "moment@>= 2.6.0", moment@^2.10, moment@^2.10.2, moment@^2.12.0:
version "2.24.0" version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==