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

Merge new-webenabled into development #716

Merged
merged 180 commits into from
Dec 27, 2023
Merged

Merge new-webenabled into development #716

merged 180 commits into from
Dec 27, 2023

Conversation

ThomasSchellenbergNextCentury
Copy link
Collaborator

If you decide to release this, the branch should really get merged into development.

cedorman and others added 30 commits February 3, 2022 13:19
@cedorman
Init version
4df7786
@cedorman
Updated readme
8719d92
@cedorman
Scene files
351075f
@cedorman
Started laying out
d1587f1
@cedorman
More style changes
13ecd46
@cedorman
More improvements
a238570
@cedorman
Get list of scenes from dir
3446930
@cedorman
Load scene by command, not hard-coded, in run_scene_with_dir. WIP, st…
96df036 
…ill need to send command
@cedorman
Load scene by command, html and mcs_interface changes. WIP
6a55e1e
@cedorman
WIP
9488b1d
@cedorman
Cleanup; add newline at end of html
54273b6
@cedorman
WIP; get action list
3994cbc
@cedorman
Split respond to scene selection separately from updating image; retu…
b3009b7 
…rn list of actions for a scene; use a logger.
@cedorman
Put action list higher (so can see when you load); make sure action l…
dff5160 
…ist is formatted
@cedorman
Format action list; better debug statements.
f29d5ac
@cedorman
Do sessions properly, using random cookie value; when loading scene, …
fdb18d4 
…show blank; check to see if the controller is alive.
@cedorman
flake8 fixes
edb86c9
@cedorman
add scene filename to list of actions
5eb5ed9
@cedorman
applied isort
ebbed10
@cedorman
added lots of log info when looking for mcs_interface
1376020
@deanwetherby
Local isort changes
254dbc2
@deanwetherby
Local flake8 changes
ad28db3
@rartiss55
Merge branch 'development' into webenabled
7979db5
@rartiss55
Updates to get things in a semi-working state again.
ea38876
@ThomasSchellenbergNextCentury
Updated default actions in webenabled interface.
728b614
@ThomasSchellenbergNextCentury
Replaced scenes in webenabled interface with Eval 6 validation dataset.
8f6e54c
@rartiss55
Add webenabled directory to precommit.
2d34e5e
@rartiss55
flake8 fixes.
f201afc
@rartiss55
Merge branch 'new-webenabled' of https://github.com/NextCenturyCorpor…
a8d4d18 
…ation/MCS into new-webenabled
@rartiss55
add missing slash.
62d4878
@ThomasSchellenbergNextCentury
MCS-1815 MCS-1930 Webenabled app now uses a production-ready server b…
9895158 
…y default. Also added configurable command line settings.
@ThomasSchellenbergNextCentury
MCS-1815 MCS-1930 Updated webenabled README and requirements file.
25f89dd
@NDCACI
file removal. See TODO
f955b18
@NDCACI
file removal. See TODO
cb8670c
@phile-caci
rearranged import
2296278
@NDCACI
Update mcsweb.py
e9d20cf
@ThomasSchellenbergNextCentury
Merge pull request #709 from NextCenturyCorporation/MCS-1982
9fbbdad 
MCS-1982 - [Webenabled] Attempting Unavailable Action Waits until Timeout
@NDCACI
Update runner_script.py
fab805b
@ThomasSchellenbergNextCentury
Merge remote-tracking branch 'origin/development' into MCS-1815-MCS-1930
18a0e69
@ThomasSchellenbergNextCentury
Merge remote-tracking branch 'origin/development' into new-webenabled
b11574a
@ThomasSchellenbergNextCentury
Merge branch 'new-webenabled' into MCS-1815-MCS-1930
876e86a
@ThomasSchellenbergNextCentury
Merge pull request #710 from NextCenturyCorporation/MCS-1815-MCS-1930
e2f3f0e 
MCS-1815 MCS-1930 Webenabled Updates: Production-Ready Server and Configurable Command Line Settings
@ThomasSchellenbergNextCentury
Merge pull request #712 from NextCenturyCorporation/mcs-1926
66bd017 
MCS - 1926 - Delete temporary files when browser session is ended
@ThomasSchellenbergNextCentury
MCS-1983 Removed old webenabled scenes.
2001afe
@ThomasSchellenbergNextCentury
MCS-1983 Added new webenabled scenes.
59df9fc
@ThomasSchellenbergNextCentury
MCS-1983 Updated webenabled task descriptions.
c41191b
@ThomasSchellenbergNextCentury
MCS-1983 Minor updates.
26432f0
@ThomasSchellenbergNextCentury
MCS-1983 Fixed capitalization.
3c06fe0
rartiss55
rartiss55 approved these changes Dec 27, 2023
View reviewed changes
Copy link
Collaborator

@rartiss55 rartiss55 left a comment

Choose a reason for hiding this comment

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

Updated some task description references for the new scene files, should be good to go.

@phile-caci phile-caci merged commit cd97572 into development Dec 27, 2023
8 checks passed
@phile-caci phile-caci deleted the new-webenabled branch December 27, 2023 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NDCACI NDCACI NDCACI approved these changes

@rartiss55 rartiss55 rartiss55 approved these changes

@phile-caci phile-caci Awaiting requested review from phile-caci

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

Successfully merging this pull request may close these issues.
6 participants
@ThomasSchellenbergNextCentury @rartiss55 @NDCACI @phile-caci @cedorman @deanwetherby