Skip to content
This repository was archived by the owner on Nov 16, 2018. It is now read-only.

Commit a42a37a

Browse files
committed
Merge branch 'master' into alex1712-master
# Conflicts: # examples/basic/basic.jsx # src/DateTimeField.jsx
2 parents 5525c63 + b4ea2f0 commit a42a37a

10 files changed

+337
-255
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ DateTimeField
3939
| **daysOfWeekDisabled** | array of integer | [] | Disables clicking on some days. Goes from 0 (Sunday) to 6 (Saturday). |
4040
| **viewMode** | string or number | 'days' | The default view to display when the picker is shown. ('years', 'months', 'days') |
4141
| **inputProps** | object | undefined | Defines additional attributes for the input element of the component. |
42+
| **minDate** | moment | undefined | The earliest date allowed for entry in the calendar view. |
43+
| **maxDate** | moment | undefined | The latest date allowed for entry in the calendar view. |
4244

4345
Update Warning
4446
===============================

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-bootstrap-datetimepicker",
3-
"version": "0.0.14",
3+
"version": "0.0.15",
44
"main": [
55
"./dist/react-bootstrap-datetimepicker.min.js"
66
],

0 commit comments

Comments
 (0)