Skip to content
This repository has been archived by the owner on Sep 9, 2021. It is now read-only.

Change calendar #142

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,40 +86,3 @@ I'd be happy to accept PRs for that.
## License

Copyright (c) 2016 [mberneti](https://twitter.com/mberneti) Inc. and individual contributors. Licensed under MIT license, see [LICENSE](LICENSE) for the full license.

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="http://berneti.ir"><img src="https://avatars3.githubusercontent.com/u/3443365?v=4" width="100px;" alt=""/><br /><sub><b>mohammadreza berneti</b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/commits?author=mberneti" title="Code">💻</a> <a href="#ideas-mberneti" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=mberneti" title="Documentation">📖</a> <a href="https://github.com/mberneti/react-datepicker2/issues?q=author%3Amberneti" title="Bug reports">🐛</a> <a href="#design-mberneti" title="Design">🎨</a> <a href="#example-mberneti" title="Examples">💡</a> <a href="#maintenance-mberneti" title="Maintenance">🚧</a> <a href="#platform-mberneti" title="Packaging/porting to new platform">📦</a> <a href="#question-mberneti" title="Answering Questions">💬</a> <a href="https://github.com/mberneti/react-datepicker2/pulls?q=is%3Apr+reviewed-by%3Amberneti" title="Reviewed Pull Requests">👀</a> <a href="#projectManagement-mberneti" title="Project Management">📆</a></td>
<td align="center"><a href="https://github.com/mohebifar"><img src="https://avatars1.githubusercontent.com/u/6104558?v=4" width="100px;" alt=""/><br /><sub><b>Mohamad Mohebifar</b></sub></a><br /><a href="#ideas-mohebifar" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=mohebifar" title="Documentation">📖</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=mohebifar" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/aliazizi"><img src="https://avatars1.githubusercontent.com/u/8492767?v=4" width="100px;" alt=""/><br /><sub><b>Ali Akbar Azizi</b></sub></a><br /><a href="#maintenance-aliazizi" title="Maintenance">🚧</a> <a href="#platform-aliazizi" title="Packaging/porting to new platform">📦</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=aliazizi" title="Code">💻</a> <a href="https://github.com/mberneti/react-datepicker2/issues?q=author%3Aaliazizi" title="Bug reports">🐛</a> <a href="#question-aliazizi" title="Answering Questions">💬</a></td>
<td align="center"><a href="https://github.com/alinjf"><img src="https://avatars3.githubusercontent.com/u/15678289?v=4" width="100px;" alt=""/><br /><sub><b>Ali Najafi</b></sub></a><br /><a href="#maintenance-alinjf" title="Maintenance">🚧</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=alinjf" title="Code">💻</a></td>
<td align="center"><a href="http://mehralian.org"><img src="https://avatars0.githubusercontent.com/u/13819774?v=4" width="100px;" alt=""/><br /><sub><b>Mehrdad Mehralian</b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/commits?author=dadwic" title="Code">💻</a> <a href="#design-dadwic" title="Design">🎨</a></td>
<td align="center"><a href="https://github.com/shayegh"><img src="https://avatars1.githubusercontent.com/u/10929932?v=4" width="100px;" alt=""/><br /><sub><b>mojtaba Shayegh</b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/issues?q=author%3Ashayegh" title="Bug reports">🐛</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=shayegh" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/moryrasb"><img src="https://avatars1.githubusercontent.com/u/15072825?v=4" width="100px;" alt=""/><br /><sub><b>mory rezaee</b></sub></a><br /><a href="#maintenance-moryrasb" title="Maintenance">🚧</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=moryrasb" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/Doomfang3"><img src="https://avatars1.githubusercontent.com/u/37439688?v=4" width="100px;" alt=""/><br /><sub><b>Mathieu Saubin</b></sub></a><br /><a href="#maintenance-Doomfang3" title="Maintenance">🚧</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=Doomfang3" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/alireza-molaee"><img src="https://avatars0.githubusercontent.com/u/15848730?v=4" width="100px;" alt=""/><br /><sub><b>alireza molaee</b></sub></a><br /><a href="#maintenance-alireza-molaee" title="Maintenance">🚧</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=alireza-molaee" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/alimzadeh"><img src="https://avatars3.githubusercontent.com/u/11006666?v=4" width="100px;" alt=""/><br /><sub><b>Ali MoghaddasZadeh</b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/issues?q=author%3Aalimzadeh" title="Bug reports">🐛</a></td>
<td align="center"><a href="http://ir.linkedin.com/in/amirzamani"><img src="https://avatars0.githubusercontent.com/u/6501462?v=4" width="100px;" alt=""/><br /><sub><b>amir zamani</b></sub></a><br /><a href="#maintenance-azadkuh" title="Maintenance">🚧</a> <a href="#platform-azadkuh" title="Packaging/porting to new platform">📦</a> <a href="https://github.com/mberneti/react-datepicker2/commits?author=azadkuh" title="Code">💻</a> <a href="https://github.com/mberneti/react-datepicker2/issues?q=author%3Aazadkuh" title="Bug reports">🐛</a> <a href="#question-azadkuh" title="Answering Questions">💬</a></td>
<td align="center"><a href="http://afsanefadaei.ir"><img src="https://avatars0.githubusercontent.com/u/37764909?v=4" width="100px;" alt=""/><br /><sub><b>Afsane Fadaei</b></sub></a><br /><a href="#maintenance-afsanefda" title="Maintenance">🚧</a> <a href="#question-afsanefda" title="Answering Questions">💬</a></td>
<td align="center"><a href="http://learnyab.com"><img src="https://avatars2.githubusercontent.com/u/17334987?v=4" width="100px;" alt=""/><br /><sub><b>Hossein Aghatabar</b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/issues?q=author%3Awhossein" title="Bug reports">🐛</a></td>
<td align="center"><a href="http://salehian.me/"><img src="https://avatars1.githubusercontent.com/u/8876390?v=4" width="100px;" alt=""/><br /><sub><b>Mahdi </b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/commits?author=mahdisalehian" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/hoseinBL"><img src="https://avatars1.githubusercontent.com/u/3403583?v=4" width="100px;" alt=""/><br /><sub><b>Hosein BehkamaL</b></sub></a><br /><a href="https://github.com/mberneti/react-datepicker2/commits?author=hoseinBL" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-enable -->
<!-- prettier-ignore-end -->
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-datepicker2",
"version": "v3.3.13",
"name": "mopon-react-datepicker2",
"version": "v3.3.14",
"description": "react datepicker component. (include persian jalaali calendar)",
"main": "dist/umd/index.js",
"types": "dist/types/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions src/components/CustomTimePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ export default class MyTimePicker extends Component {
}

render() {
const { momentValue, isGregorian, outsideClickIgnoreClass } = this.props;
const { momentValue, isGregorian, outsideClickIgnoreClass, showAMPM } = this.props;

return (
<TimePicker
showAMPM
showAMPM={showAMPM == undefined ? true : showAMPM}
isGregorian={isGregorian}
showSecond={false}
allowEmpty={false}
Expand Down
Loading