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.

Sign up for GitHub

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

Jump to bottom

fix timestamp string representation on different platforms #6777

Merged
merged 6 commits into from
Jul 12, 2023
Merged

fix timestamp string representation on different platforms #6777

merged 6 commits into from
Jul 12, 2023

Conversation

nicola-cab
Copy link
Member

@nicola-cab nicola-cab commented Jul 10, 2023 •
edited
Loading

What, How & Why?

Fixes: #5451

☑️ ToDos

  • 📝 Changelog update
  • 🚦 Tests (or not relevant)
  • C-API, if public C++ API changed.

@cla-bot cla-bot bot added the cla: yes label Jul 10, 2023
ironage
ironage reviewed Jul 10, 2023
View reviewed changes
src/realm/obj.cpp Outdated Show resolved Hide resolved
ironage
ironage reviewed Jul 10, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@nicola-cab nicola-cab force-pushed the nc/fix_timestamp_multiplatform branch from ba92879 to 7ff238f Compare July 11, 2023 10:34
nicola-cab
nicola-cab commented Jul 11, 2023
View reviewed changes
test/expect_xjson.json Outdated Show resolved Hide resolved
@nicola-cab nicola-cab force-pushed the nc/fix_timestamp_multiplatform branch from f22e8ff to 166615a Compare July 11, 2023 17:48
@nicola-cab nicola-cab requested a review from ironage July 11, 2023 17:51
@nicola-cab nicola-cab force-pushed the nc/fix_timestamp_multiplatform branch from d4483c5 to dc15199 Compare July 11, 2023 17:58
ironage
ironage approved these changes Jul 11, 2023
View reviewed changes
Copy link
Contributor

@ironage ironage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM barring one spelling suggestion.

@nicola-cab @ironage
Update CHANGELOG.md
34b6228 
Co-authored-by: James Stone <james.stone@mongodb.com>
@nicola-cab nicola-cab merged commit b4c8492 into master Jul 12, 2023
2 checks passed
@nicola-cab nicola-cab deleted the nc/fix_timestamp_multiplatform branch July 12, 2023 08:31
@ironage
Copy link
Contributor

ironage commented Jul 12, 2023

@nicola-cab in the future, please use the "squash" strategy when merging PRs like this into master to keep our main commit history clean.

@nicola-cab
Copy link
Member Author

@nicola-cab in the future, please use the "squash" strategy when merging PRs like this into master to keep our main commit history clean.

I noticed, I usually do use "squash" (and I selected that before to merge), however I think I hit a problem after I directly merged your changelog suggestion, I should have refreshed the page, because when I hit "squash and merge" what github did was a "merge commit".
So next time before to merge the PR after I integrate suggestions directly from github, I need to remember to refresh the page in the browser.

@ironage
Copy link
Contributor

ironage commented Jul 12, 2023

Ah okay, all good. It isn't the first time Github has had cache issues. 😅

@nielsenko nielsenko mentioned this pull request Aug 3, 2023
Closed
jedelbo added a commit that referenced this pull request Aug 4, 2023
@jedelbo
Revert "Merge pull request #6777 from realm/nc/fix_timestamp_multipla…
3d44d28 
…tform"

This reverts commit b4c8492, reversing
changes made to 42a84ed.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ironage ironage ironage approved these changes

@tkaye407 tkaye407 tkaye407 approved these changes

Assignees

@nicola-cab nicola-cab

Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

toJson serialization behaves incorrectly for dates on Windows, Linux, and Android
3 participants
@nicola-cab @ironage @tkaye407