Skip to content

Commit

Permalink
Merge branch 'development' into master-dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	dist/js/jQuery-provider.js
#	dist/js/jQuery-provider.min.js
#	dist/js/tempus-dominus.esm.js
#	dist/js/tempus-dominus.esm.js.map
#	dist/js/tempus-dominus.esm.min.js
#	dist/js/tempus-dominus.js
#	dist/js/tempus-dominus.js.map
#	dist/js/tempus-dominus.min.js
#	dist/locales/ar-SA.js
#	dist/locales/ar.js
#	dist/locales/de.js
#	dist/locales/es.js
#	dist/locales/fi.js
#	dist/locales/fr.js
#	dist/locales/it.js
#	dist/locales/nl.js
#	dist/locales/ro.js
#	dist/locales/ru.js
#	dist/locales/sl.js
#	dist/plugins/customDateFormat.js
#	dist/plugins/fa-five.js
#	dist/plugins/moment-parse.js
#	package-lock.json
#	package.json
#	src/docs/partials/change-log.html
#	src/docs/templates/index.html
#	src/docs/templates/shell.html
#	src/js/jQuery-provider.js
#	src/js/tempus-dominus.ts
#	src/nuget/TempusDominus.nuspec
#	src/nuget/TempusDominus.scss.nuspec
  • Loading branch information
Eonasdan committed Sep 15, 2022
2 parents 1e839c2 + bd0e76d commit a27139c
Show file tree
Hide file tree
Showing 48 changed files with 1,243 additions and 742 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Rate on Openbase](https://badges.openbase.com/js/rating/@eonasdan/tempus-dominus.svg)](https://openbase.com/js/@eonasdan/tempus-dominus?utm_source=embedded&utm_medium=badge&utm_campaign=rate-badge)

# Tempus Dominus Date/Time Picker v6.0.1
# Tempus Dominus Date/Time Picker v6.1.2

Tempus Dominus is a powerful and robust date time picker for javascript. Version 6 is another major rewrite over the previous version. V6 is written with modern browsers in mind and is written in typescript. Bootstrap, momentjs and jQuery are no longer required dependencies. Popper2 is all that is required for the picker to position correctly. If you still require jQuery (seriously, you should move off that asap) there's a jQuery provider that wraps the native js functions.

Expand Down
3 changes: 2 additions & 1 deletion build/change-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ const DRY_RUN = process.argv.includes('--dry') || process.argv.includes('--dry-r

// These are the filetypes we only care about replacing the version
const GLOB = [
'**/*.{css,html,js,json,md,scss,txt,yml,ts,nuspec}'
'**/*.{css,html,js,json,md,scss,txt,yml,ts,nuspec}',
'!**/change-log*'
]
const GLOBBY_OPTIONS = {
cwd: path.join(__dirname, '..'),
Expand Down
2 changes: 1 addition & 1 deletion dist/js/jQuery-provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*global $, tempusDominus */

/*!
* Tempus Dominus v6.0.1 (https://getdatepicker.com/)
* Tempus Dominus v6.1.2 (https://getdatepicker.com/)
* Copyright 2013-2021 Jonathan Peterson
* Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/jQuery-provider.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 40 additions & 7 deletions dist/js/tempus-dominus.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/tempus-dominus.esm.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/tempus-dominus.esm.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit a27139c

Please sign in to comment.