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

Changes for v2024.3.3 #6542

Merged
merged 3 commits into from
Dec 10, 2024
Merged

Changes for v2024.3.3 #6542

merged 3 commits into from
Dec 10, 2024

Conversation

seadowg
Copy link
Member

@seadowg seadowg commented Dec 5, 2024 •
edited
Loading

This adds:

Before submitting this PR, please make sure you have:

  • added or modified tests for any new or changed behavior
  • run ./gradlew connectedAndroidTest (or ./gradlew testLab) and confirmed all checks still pass
  • added a comment above any new strings describing it for translators
  • added any new strings with date formatting to DateFormatsTest
  • verified that any code or assets from external sources are properly credited in comments and/or in the about file.
  • verified that any new UI elements use theme colors. UI Components Style guidelines

@seadowg
Merge pull request getodk#6538 from grzesiek2010/COLLECT-6537
5bff6b6 
Fixed the filtering of duplicate columns
@seadowg seadowg changed the base branch from master to v2024.3.x December 5, 2024 09:02
@seadowg
Merge pull request getodk#6540 from grzesiek2010/COLLECT-6364_final
264f3f1 
Throw an exception when there is an attempt to access file outside of Collect directory
@seadowg seadowg marked this pull request as ready for review December 6, 2024 10:09
@seadowg seadowg requested a review from grzesiek2010 December 6, 2024 10:09
@seadowg
Merge pull request getodk#6543 from grzesiek2010/COLLECT-6537_2
2ccb27f 
Fixed the filtering of duplicate columns
@seadowg seadowg removed the request for review from grzesiek2010 December 9, 2024 12:58
@seadowg seadowg marked this pull request as draft December 9, 2024 12:58
@seadowg seadowg marked this pull request as ready for review December 9, 2024 13:31
@seadowg seadowg requested a review from grzesiek2010 December 9, 2024 13:31
lognaturel
lognaturel approved these changes Dec 10, 2024
View reviewed changes
Copy link
Member

@lognaturel lognaturel left a comment

Choose a reason for hiding this comment

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

These are all changes I expect.

@lognaturel lognaturel merged commit d3c5c67 into getodk:v2024.3.x Dec 10, 2024
6 checks passed
@seadowg seadowg deleted the v2024.3.3-changes branch December 10, 2024 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lognaturel lognaturel lognaturel approved these changes

@grzesiek2010 grzesiek2010 Awaiting requested review from grzesiek2010

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@seadowg @lognaturel