Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timezone conversion #1073

Merged
merged 2 commits into from
Sep 25, 2020
Merged

Fix timezone conversion #1073

merged 2 commits into from
Sep 25, 2020

Conversation

dtengeri
Copy link
Contributor

Fixes #1072

@iamkun
Copy link
Owner

iamkun commented Sep 25, 2020

Looks cool!

Would you mind resolved the conflicts before we could get it merged?

Cheers

@codecov
Copy link

codecov bot commented Sep 25, 2020

Codecov Report

Merging #1073 into dev will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##               dev     #1073   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          172       172           
  Lines         1534      1534           
  Branches       324       324           
=========================================
  Hits          1534      1534           
Impacted Files Coverage Δ
src/plugin/timezone/index.js 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cbb755e...ce10528. Read the comment docs.

@dtengeri
Copy link
Contributor Author

Thanks!

Resolved the conflicts.

@iamkun iamkun merged commit 16816a3 into iamkun:dev Sep 25, 2020
iamkun pushed a commit that referenced this pull request Sep 28, 2020
# [1.9.0](v1.8.36...v1.9.0) (2020-09-28)

### Bug Fixes

* Add `setDefault` typing to timezone.d.ts ([#1057](#1057)) ([c0f0886](c0f0886))
* fix DST bug in utc plugin ([#1053](#1053)) ([3d73543](3d73543))
* Fix optional type for timezone plugin ([#1081](#1081)) ([a6ebcf2](a6ebcf2)), closes [#1079](#1079)
* Fix timezone plugin conversion bug ([#1073](#1073)) ([16816a3](16816a3))
* update duration plugin type file ([#1065](#1065)) ([94af9af](94af9af))
* update timezone plugin to support getting offset name e.g. EST ([#1069](#1069)) ([cbb755e](cbb755e))
* update utc plugin to support keepLocalTime `.utc(true)` ([#1080](#1080)) ([5ce4e0d](5ce4e0d))

### Features

* Correct casing for en-sg locale name ([#1048](#1048)) ([2edaddc](2edaddc))
@iamkun
Copy link
Owner

iamkun commented Sep 28, 2020

🎉 This PR is included in version 1.9.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

andrewhood125ruhuc added a commit to andrewhood125ruhuc/SidRH2 that referenced this pull request May 10, 2022
# [1.9.0](iamkun/dayjs@v1.8.36...v1.9.0) (2020-09-28)

### Bug Fixes

* Add `setDefault` typing to timezone.d.ts ([#1057](iamkun/dayjs#1057)) ([c0f0886](iamkun/dayjs@c0f0886))
* fix DST bug in utc plugin ([#1053](iamkun/dayjs#1053)) ([3d73543](iamkun/dayjs@3d73543))
* Fix optional type for timezone plugin ([#1081](iamkun/dayjs#1081)) ([a6ebcf2](iamkun/dayjs@a6ebcf2)), closes [#1079](iamkun/dayjs#1079)
* Fix timezone plugin conversion bug ([#1073](iamkun/dayjs#1073)) ([16816a3](iamkun/dayjs@16816a3))
* update duration plugin type file ([#1065](iamkun/dayjs#1065)) ([94af9af](iamkun/dayjs@94af9af))
* update timezone plugin to support getting offset name e.g. EST ([#1069](iamkun/dayjs#1069)) ([cbb755e](iamkun/dayjs@cbb755e))
* update utc plugin to support keepLocalTime `.utc(true)` ([#1080](iamkun/dayjs#1080)) ([5ce4e0d](iamkun/dayjs@5ce4e0d))

### Features

* Correct casing for en-sg locale name ([#1048](iamkun/dayjs#1048)) ([2edaddc](iamkun/dayjs@2edaddc))
andrewhood125ruhuc added a commit to andrewhood125ruhuc/SidRH2 that referenced this pull request May 10, 2022
# [1.9.0](iamkun/dayjs@v1.8.36...v1.9.0) (2020-09-28)

### Bug Fixes

* Add `setDefault` typing to timezone.d.ts ([#1057](iamkun/dayjs#1057)) ([c0f0886](iamkun/dayjs@c0f0886))
* fix DST bug in utc plugin ([#1053](iamkun/dayjs#1053)) ([3d73543](iamkun/dayjs@3d73543))
* Fix optional type for timezone plugin ([#1081](iamkun/dayjs#1081)) ([a6ebcf2](iamkun/dayjs@a6ebcf2)), closes [#1079](iamkun/dayjs#1079)
* Fix timezone plugin conversion bug ([#1073](iamkun/dayjs#1073)) ([16816a3](iamkun/dayjs@16816a3))
* update duration plugin type file ([#1065](iamkun/dayjs#1065)) ([94af9af](iamkun/dayjs@94af9af))
* update timezone plugin to support getting offset name e.g. EST ([#1069](iamkun/dayjs#1069)) ([cbb755e](iamkun/dayjs@cbb755e))
* update utc plugin to support keepLocalTime `.utc(true)` ([#1080](iamkun/dayjs#1080)) ([5ce4e0d](iamkun/dayjs@5ce4e0d))

### Features

* Correct casing for en-sg locale name ([#1048](iamkun/dayjs#1048)) ([2edaddc](iamkun/dayjs@2edaddc))
splashwizard pushed a commit to splashwizard/tracking-time that referenced this pull request Oct 21, 2024
# [1.9.0](iamkun/dayjs@v1.8.36...v1.9.0) (2020-09-28)

### Bug Fixes

* Add `setDefault` typing to timezone.d.ts ([#1057](iamkun/dayjs#1057)) ([c0f0886](iamkun/dayjs@c0f0886))
* fix DST bug in utc plugin ([#1053](iamkun/dayjs#1053)) ([3d73543](iamkun/dayjs@3d73543))
* Fix optional type for timezone plugin ([#1081](iamkun/dayjs#1081)) ([a6ebcf2](iamkun/dayjs@a6ebcf2)), closes [#1079](iamkun/dayjs#1079)
* Fix timezone plugin conversion bug ([#1073](iamkun/dayjs#1073)) ([16816a3](iamkun/dayjs@16816a3))
* update duration plugin type file ([#1065](iamkun/dayjs#1065)) ([94af9af](iamkun/dayjs@94af9af))
* update timezone plugin to support getting offset name e.g. EST ([#1069](iamkun/dayjs#1069)) ([cbb755e](iamkun/dayjs@cbb755e))
* update utc plugin to support keepLocalTime `.utc(true)` ([#1080](iamkun/dayjs#1080)) ([5ce4e0d](iamkun/dayjs@5ce4e0d))

### Features

* Correct casing for en-sg locale name ([#1048](iamkun/dayjs#1048)) ([2edaddc](iamkun/dayjs@2edaddc))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Timezone conversion gives wrong result
2 participants