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

Merging feature/APPEALS-25109 into feature/APPEALS-26734 #19191

Merged
merged 72 commits into from
Aug 15, 2023
Merged

Merging feature/APPEALS-25109 into feature/APPEALS-26734 #19191

merged 72 commits into from
Aug 15, 2023

Conversation

breedbah
Copy link
Contributor

@breedbah breedbah commented Aug 15, 2023 •
edited
Loading

Description

No changes were made, merged feature/APPEALS-25109 into feature/APPEALS-26734

Acceptance Criteria

  • Code compiles correctly

breedbah and others added 30 commits July 20, 2023 13:50
@breedbah
Added feature toggles to index.html.rb
c468255
@breedbah
Added toggle to index.html.erb
7f0bae2
@lauren-e-thompson
Progress on conference types radio field
5fe4690
@lauren-e-thompson
adding conference type selection logic
6780e00
@konhilas-ariana
APPEALS-25141: created migrations to add pexip bool column to users v…
72cc092 
…irtual hearings and conference links
@konhilas-ariana
APPEALS-25141: set default value to true on users
e18314c
@lauren-e-thompson
Work on radio field selection
07be387
@lauren-e-thompson
Fixed errors with conference selection radio field
4d9694c
@lauren-e-thompson
Clean up code after new import file
3264c4b
@lauren-e-thompson
Update copy file and state
fc72e95
@lauren-e-thompson
APPEALS-25112 Added styling for radio field component
6fc2c0f
@breedbah
Merge branch 'lthompson/APPEALS-25112' into b_reed/APPEALS-25130-v3
8db7067
@breedbah
APPEALS-25130 updated user.rb
6957d77
@konhilas-ariana
APPEALS-25141: rolling back changes, creating new migrations, deletin…
ba63cf8 
…g the old, to meeting type varchar default on users only
@konhilas-ariana
APPEALS-25141: removed version 5.2 from migrations
0e48803
@breedbah
Merge branch 'b_reed/APPEALS-25130-v3' of https://github.com/departme…
e22ddda 
…nt-of-veterans-affairs/caseflow into b_reed/APPEALS-25130-v3
@mchbidwell
Merge pull request #19038 from department-of-veterans-affairs/b_reed/…
ab8ce3c 
…APPEALS-25130-v3

b_reed/APPEALS-25130 Create Feature Flag for Pexip/Webex functionality
@lauren-e-thompson
Create jest test
bdc3a52
@lauren-e-thompson
Test passing
3dae8f5
@lauren-e-thompson
Fixed syntax errors from merged code
5bfdc9b
@lauren-e-thompson
Radio buttons fixed to only display on Hearings Admin page
c023af4
@lauren-e-thompson
Wrap li elements in ul elements
08c7910
@lauren-e-thompson
Test that radio button values change when selected
7421103
@lauren-e-thompson
Update to testing logic with radio buttons
daae3bf
@konhilas-ariana
APPEALS-25141: refactoring migrations to include up/down methods, add…
5115f7c 
…ing default for virt hearings and conf links
@lauren-e-thompson
Styling comments updated after review
78af497
@mchbidwell
Merge branch 'master' into akonhilas/APPEALS-25141
ba97e73
@ThorntonMatthew
Revert 'Merge pull request #19038 from department-of-veterans-affairs…
0ab42a3 
…/b_reed/APPEALS-25130-v3'

This reverts commit ab8ce3c, reversing
changes made to 6fc2c0f.
@lauren-e-thompson
Fixed linting issues and updated jest snapshot
97bba81
@ThorntonMatthew
Merge branch 'feature/APPEALS-25109' into lthompson/APPEALS-25112
6e9c1e8
ThorntonMatthew and others added 20 commits August 7, 2023 13:46
@ThorntonMatthew
Merge branch 'master' into feature/APPEALS-25109
9b35011
@konhilas-ariana
APPEALS-25136: updated current user to use requeststore
6bafefa
@konhilas-ariana
Merge branch 'feature/APPEALS-25109' into akonhilas/APPEALS-25136
2609eb5
@breedbah
APPEALS-25137 start of unit test creation
15cb347
@breedbah
APPEALS-25137 Added async await to test
69fc3aa
@ThorntonMatthew
Merge branch 'master' into feature/APPEALS-25109
040212e
@breedbah
APPEALS-25137 adding mocking ApiUtil to tests
4c122ca
@breedbah
Appeals-25137 Completed unit tests
844f60d
@breedbah
APPEALS-25137 Updated unit tests
50e929f
@breedbah
APPEALS-25137 D.R.Y. out code in tests
8862f5f
@breedbah
APPEALS-25137 Linting fixes
6a84567
@konhilas-ariana
APPEALS-25136: added error catching on the case statement in client
cfd7400
@breedbah
Merge branch 'feature/APPEALS-25109' into b_reed/APPEALS-25137
41516af
@konhilas-ariana
APPEALS-25136: make pexip specific errors and language more general
9d4e99e
@konhilas-ariana
APPEALS-25136: cannot get rspec to pass
1f9dc77
@konhilas-ariana
APPEALS-25136: rspec udpate
0bb944b
@konhilas-ariana
APPEALS-25136: updated tests, all are passing
599244a
@mchbidwell
Merge pull request #19109 from department-of-veterans-affairs/b_reed/…
2d95602 
…APPEALS-25137

b_reed/APPEALS-25137 Complete meeting_type & conference_selection_visibility FeatureToggle Implementation
@mchbidwell
Merge branch 'feature/APPEALS-25109' into akonhilas/APPEALS-25136
2777e8d
@mchbidwell
Merge pull request #19107 from department-of-veterans-affairs/akonhil…
caf8333 
…as/APPEALS-25136

akonhilas/APPEALS-25136
@breedbah breedbah changed the title Merging branches Merging feature/APPEALS-25109 into feature/APPEALS-26734 Aug 15, 2023
@breedbah breedbah self-assigned this Aug 15, 2023
@breedbah breedbah added Team: Oumuamua ☄️ Development Team for the Hearings ART Project: Virtual-Hearings labels Aug 15, 2023
@mchbidwell mchbidwell marked this pull request as ready for review August 15, 2023 14:51
@mchbidwell mchbidwell merged commit 3508af2 into feature/APPEALS-26734 Aug 15, 2023
23 of 28 checks passed
@ThorntonMatthew ThorntonMatthew deleted the feature/APPEALS-25109 branch November 22, 2023 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mchbidwell mchbidwell mchbidwell approved these changes

Assignees

@breedbah breedbah

Labels
Project: Virtual-Hearings Team: Oumuamua ☄️ Development Team for the Hearings ART
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@breedbah @mchbidwell @lauren-e-thompson @konhilas-ariana @ThorntonMatthew