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

Merge dev/beta into dev/alpha #17

Merged
merged 74 commits into from
Nov 18, 2023
Merged

Merge dev/beta into dev/alpha #17

merged 74 commits into from
Nov 18, 2023

Conversation

Brent-Call
Copy link
Contributor

It looks like dev/alpha hasn't been updated since August? Yeesh, a bunch of changes have happened since then.

ZigguratV and others added 30 commits August 24, 2023 19:16
Spaceport cherrypick

* mobile feature flags

* remove map.jsx from the code

* cherry pick of the spaceport PR

* version bump
Tweaks to Spaceport Cherrypick
Siphoning and pacts ui improvements
Support tabindex and keyboard navigation for buttons

* basic tabIndex support

* fix gear icon toggle + some css tweaks

* fix tab toggling gear icon

* toggle option for collapsible groups
Automation Descriptions

Approved-by: Arima B.
bloodrizer and others added 25 commits November 2, 2023 20:01
Tech: 'Construction' increases queue cap by 1
Update toggle automation links even if there are 0 of the building
More explicit branch mapping
Merging lasest master changes to beta (most importantly CICD actions)
Hydroponics display bug solution
@bloodrizer bloodrizer requested review from dpopovms and removed request for dpopovms November 18, 2023 01:19
@bloodrizer bloodrizer merged commit 7b282a8 into dev/alpha Nov 18, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants