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

Fixes merge conflicts #417

Closed
wants to merge 39 commits into from
Closed

Fixes merge conflicts #417

Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
65fdc58
Add a markdown file for dashboard descriptions, link new file in READ…
mitchelbaker-cisa Dec 29, 2023
6cbef43
Release 1.3.1 merge into main (#154)
mitchelbaker-cisa Jan 12, 2024
1608db7
Fixes dashboard update not importing on fresh install (#167) (#169)
mitchelbaker-cisa Jan 24, 2024
676adf3
Add proof of concept selenium tests
adhilto Jan 5, 2024
b266543
Correct the script name in the doc string
adhilto Jan 10, 2024
0778c48
User Security Selenium Tests for No Results Panels
Jan 31, 2024
665d8ef
First full selenium test. Currently just User Security
Feb 1, 2024
245514b
WIP User HR
Feb 1, 2024
b748475
Completed all dashboards. Requires testing now
Feb 7, 2024
0cbe654
Cut dev comments
rgbrow1949 Feb 7, 2024
fe27467
Debugging a couple unit tests that error out. Two left
Feb 8, 2024
b058e56
Install LME in the testbed from a single script (#150)
cbaxley Feb 8, 2024
a367188
Fix deploy.sh data retention failure error (#190)
mitchelbaker-cisa Feb 12, 2024
27aae85
Automatically Add Tags to Azure Resources (#186)
adhilto Feb 12, 2024
95385ef
Conflict fix
Feb 13, 2024
967b41c
Switched script to headless mode
Feb 13, 2024
72d1999
added switch for headless, detached, and debug mode. Bug where driver…
Feb 13, 2024
e4e491e
Merge branch 'main' into selenium-tests
rgbrow1949 Feb 15, 2024
45cad07
Refactored long line and added switch for debug mode
Feb 16, 2024
a460cb5
Removed unnecessary comments
rgbrow1949 Feb 20, 2024
480b816
Merge pull request #182 from cisagov/selenium-tests
rgbrow1949 Feb 21, 2024
1fe5d6d
Update pull_request_template.md (#198)
llwaterhouse Feb 22, 2024
f5c617d
Python testbed setup (#183)
cbaxley Mar 4, 2024
34b2ff9
Update PULL_REQUEST_TEMPLATE.md (#206)
llwaterhouse Mar 4, 2024
7e02e61
Made changes to facilitate HTML Reports on test execution (#211)
rishagg01 Mar 6, 2024
49190a0
removed tags flag from nsg because it was preventing some rules from …
llwaterhouse Mar 6, 2024
94161e1
Update PULL_REQUEST_TEMPLATE.md (#217)
llwaterhouse Mar 7, 2024
fcb7199
Create new workflow for automating the release process (#199)
mitchelbaker-cisa Mar 8, 2024
328caa5
Github workflows for building environments (#195)
cbaxley Apr 16, 2024
cb66dbb
changing .github/README.md name to prevent it apperaing on main web p…
causand22 Apr 16, 2024
83cb7db
Append the flags to the end of the password file (#263)
cbaxley May 10, 2024
eb8fb9f
Create a workflow for a burndown chart (#302)
cbaxley May 28, 2024
1dd58f7
Clean up debugging information from the workflow (#310)
cbaxley May 29, 2024
45c783e
Break up selenium tests (#281)
cbaxley May 30, 2024
f1d4cc1
API calls code for Data Insertion (#343)
rishagg01 Jul 2, 2024
8408852
Updated selenium tests for USER HR dashboard panels post data inserti…
rishagg01 Jul 24, 2024
c7a13fb
Updated User HR Dashboard Selenium Test for User HR Logon Title panel…
rishagg01 Jul 25, 2024
1d072aa
Merge branch 'main' into release-1.4.0
cbaxley Jul 30, 2024
32046c6
Merge remote-tracking branch 'origin/release-1.4.0' into release-1.4.0
cbaxley Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.