Skip to content
This repository was archived by the owner on Sep 27, 2024. It is now read-only.

Commit 98a40b5

Browse files
committed
update docs, build 4.17.37
1 parent 9e3f8d1 commit 98a40b5

15 files changed

+107
-15
lines changed

.gitattributes

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ site/
88
*.user
99
*.csproj
1010
*.sln
11-
*.nupkg
11+
*.nupkg
12+
index.html

Gruntfile.js

+11
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,15 @@ module.exports = function (grunt) {
169169
]);
170170

171171
grunt.registerTask('test', ['jshint', 'jscs', 'uglify', 'less', 'jasmine']);
172+
173+
grunt.registerTask('release', function (version) {
174+
if (!version || version.split('.').length !== 3) {
175+
grunt.fail.fatal('malformed version. Use\n\n grunt release:1.2.3');
176+
}
177+
178+
grunt.task.run([
179+
'bump_version:' + version,
180+
'build:travis'
181+
]);
182+
});
172183
};

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eonasdan-bootstrap-datetimepicker",
3-
"version": "4.15.35",
3+
"version": "4.17.37",
44
"main": [
55
"build/css/bootstrap-datetimepicker.min.css",
66
"build/js/bootstrap-datetimepicker.min.js"

build/css/bootstrap-datetimepicker.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Datetimepicker for Bootstrap 3
3-
* version : 4.15.35
3+
* version : 4.17.37
44
* https://github.com/Eonasdan/bootstrap-datetimepicker/
55
*/
66
.bootstrap-datetimepicker-widget {

build/css/bootstrap-datetimepicker.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/js/bootstrap-datetimepicker.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-datetimepicker",
3-
"version": "4.15.35",
3+
"version": "4.17.37",
44
"main": ["build/css/bootstrap-datetimepicker.min.css","build/js/bootstrap-datetimepicker.min.js"],
55
"dependencies": {
66
"jquery" : ">=1.8.3",

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "eonasdan/bootstrap-datetimepicker",
33
"type": "component",
4-
"version": "4.15.35",
4+
"version": "4.17.37",
55
"description": "Date/time picker widget based on twitter bootstrap",
66
"keywords": [
77
"bootstrap",

docs/ChangeLog.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Version 4
22

3+
## 4.17.37
4+
5+
### New Features
6+
7+
* Momentjs TZ intergration #1242 thanks @bodrick
8+
* Independent CSS file, in case you don't want bootstrap for some reason
9+
10+
### Bug Squashing
11+
12+
* Slight changes decade view
13+
* Moved all tooltip text to `tooltips`
14+
* fixed #1212
15+
316
## 4.15.35
417

518
### New Features

docs/FAQ.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ Set `debug:true` which will force the picker to stay open, even `onBlur`. You ca
1515

1616
# How do I change the start of the week?
1717

18-
Start of the week is based on the [`locale` provided](Options.md#locale). This is defined by moment's locales. If you want to change it, create your own locale file or override. [See moment's docs](http://momentjs.com/docs/#/i18n/).
18+
Start of the week is based on the [`locale` provided](Options.md#locale). This is defined by moment's locales. If you want to change it, create your own locale file or override. [See moment's docs](http://momentjs.com/docs/#/i18n/).
19+
20+
# How I use the picker as birthday picker?
21+
22+
Use the [`viewMode`](Options.md#viewmode) option to `'years'`

docs/Options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Shows the week of the year to the left of first day of the week.
183183
### viewMode
184184

185185
Default: 'days'
186-
Accepts: 'years','months','days'
186+
Accepts: 'decades','years','months','days'
187187

188188
The default view to display when the picker is shown.
189189

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": {
99
"moment": "~2.8",
1010
"moment-timezone" : "~0.4",
11-
"bootstrap": "^3.0",
11+
"bootstrap": "^3.3",
1212
"jquery": ">=1.8.3 <2.2.0"
1313
},
1414
"description": "A date/time picker component designed to work with Bootstrap 3 and Momentjs. For usage, installation and demos see Project Site on GitHub",
@@ -39,5 +39,5 @@
3939
"type": "git",
4040
"url": "https://github.com/eonasdan/bootstrap-datetimepicker.git"
4141
},
42-
"version": "4.15.35"
42+
"version": "4.17.37"
4343
}

src/js/bootstrap-datetimepicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! version : 4.15.35
1+
/*! version : 4.17.37
22
=========================================================
33
bootstrap-datetimejs
44
https://github.com/Eonasdan/bootstrap-datetimepicker

src/less/_bootstrap-datetimepicker.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Datetimepicker for Bootstrap 3
3-
* version : 4.15.35
3+
* version : 4.17.37
44
* https://github.com/Eonasdan/bootstrap-datetimepicker/
55
*/
66
@bs-datetimepicker-timepicker-font-size: 1.2em;

0 commit comments

Comments
 (0)