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

Allow to change dark mode to light without refresh #3593

Closed
wants to merge 15 commits into from
Closed

Allow to change dark mode to light without refresh #3593

wants to merge 15 commits into from

Conversation

CarolineDenis
Copy link
Contributor

@CarolineDenis CarolineDenis commented Jun 7, 2023 •
edited
Loading

Fixes #3544

CarolineDenis and others added 15 commits May 3, 2023 07:37
@CarolineDenis
Add prepType to query table to edit in same fictif record set
9f895cc 
Fixes #2754
@maxpatiiuk
Remove front-end pick list size limit checks
ab88823 
It was buggy (see #3482) and didn't serve a purpose anymore.
Also, back-end already removed these checks.

Fixes #3482
@CarolineDenis
Create a pick list editor componenent
bd2ba16
@maxpatiiuk
Fix TypeScript not recognizing table name check
c1b084a
@maxpatiiuk
Merge remote-tracking branch 'origin/production' into issue-2754
da94522
@maxpatiiuk
Simplify check for domain filter
295fb31
@maxpatiiuk
Don't allow invalid usage of domainFilter
19666c9
@maxpatiiuk @github-actions
Lint code with ESLint and Prettier
e6df6f3 
Triggered by 19666c9 on branch refs/heads/issue-2754
@CarolineDenis
Display PickListEditor in readOnly mode
c025671
@maxpatiiuk
Merge branch 'production' into issue-3482
87cd362
@maxpatiiuk
Merge pull request #3484 from specify/issue-3482
d83f515 
Remove front-end pick list size limit checks
@weblate
Sync localization strings with Weblate
1873822 
Triggered by 617a505 on branch refs/heads/weblate-localization
@weblate
Sync localization strings with Weblate
e88fe14 
Triggered by dae4084 on branch refs/heads/weblate-localization
@CarolineDenis
Merge pull request #3441 from specify/issue-2754
80ded6e 
Add prepType to query table to edit them in same fictitious record set
@CarolineDenis
Allow to change dark mode to light without refresh
af289ba 
Foxes #3544
@CarolineDenis CarolineDenis requested review from melton-jason and a team June 7, 2023 18:00
@CarolineDenis CarolineDenis changed the base branch from production to v7.8.12-prerelease June 7, 2023 18:28
melton-jason
melton-jason requested changes Jun 8, 2023
View reviewed changes
Copy link
Contributor

@melton-jason melton-jason left a comment

Choose a reason for hiding this comment

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

It looks like this Pull Request may include commits that are in production that aren't in v7.8.12-prerelease .

This most likely happened because the branch was created and based off of production, and then the base branch was changed later. It looks like Git kept the commits since production when you changed the base branch.
(I could be wrong about this. Check to make sure whether v7.8.12-prerelease includes the other commits we are trying to merge into v7.8.12-prelease with this Pull Request).

The commit with the fix is af289ba.
If the extra commits are from production, can you remove them?
I would probably accomplish this by resetting the branch to af289ba, stashing the changes, resetting the branch to the commit v7.8.12-prerelease was branched from production, checking out the files and popping the stashed changes.
Then you can recommit your changes.

I can do this as well if you are busy or are not sure how 😅

@CarolineDenis
Copy link
Contributor Author

It looks like this Pull Request may include commits that are in production that aren't in v7.8.12-prerelease .

This most likely happened because the branch was created and based off of production, and then the base branch was changed later. It looks like Git kept the commits since production when you changed the base branch. (I could be wrong about this. Check to make sure whether v7.8.12-prerelease includes the other commits we are trying to merge into v7.8.12-prelease with this Pull Request).

The commit with the fix is af289ba. If the extra commits are from production, can you remove them? I would probably accomplish this by resetting the branch to af289ba, stashing the changes, resetting the branch to the commit v7.8.12-prerelease was branched from production, checking out the files and popping the stashed changes. Then you can recommit your changes.

I can do this as well if you are busy or are not sure how 😅

you're right I base this branch on the wrong one. I'll fix this

@CarolineDenis
Copy link
Contributor Author

Fixed in #3598

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@melton-jason melton-jason melton-jason requested changes

@carlosmbe carlosmbe carlosmbe approved these changes

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

Successfully merging this pull request may close these issues.

Dark/Light Mode Transitions Now Require Refresh
5 participants
@CarolineDenis @carlosmbe @melton-jason @maxpatiiuk @weblate