Skip to content
This repository has been archived by the owner on Feb 8, 2023. It is now read-only.

Pushing changes from dev to staging #1383

Merged
merged 92 commits into from
Jul 2, 2020
Merged

Pushing changes from dev to staging #1383

merged 92 commits into from
Jul 2, 2020

Conversation

abdul-fs
Copy link
Contributor

@abdul-fs abdul-fs commented Jul 2, 2020 •
edited
Loading

Moving changes from dev to staging.

This pull request is ready to merge when...

  • Feature branch is starts with the issue number
  • Is connected to its original issue via zenhub 👇
  • Tests have been updated
  • All tests are passing and meet coverage, linting, and accessibility requirements. And no security vulnerabilities ⚫️(Circle)
  • Server actions captured by logs (manual)
  • Documentation / readme.md updated (manual)
  • This code has been reviewed by someone other than the original author

Dmac26 and others added 30 commits April 10, 2020 15:45
@Dmac26
Update input class for proper sizing
8f15272
@Dmac26
Update activity-description for field size
c993e78
@Dmac26
Remove unnecessary line break
e7ed59b
Add .ts file
cac634e
@Dmac26
Update phone-number.component.ts
18cd5c6
@Dmac26
Update phone-number.component.html
4c093f4
@Dmac26
Update _application-view.scss
01369a7
@Dmac26
application-noncommercial-group.component.html
82cae00
@Dmac26
Delete phone-number-min-validation.ts
40911eb
@Dmac26
Delete phone-number-max-length-validation.ts
59d2456
@Dmac26
Rmv instances "misplaced 'else'". Add whitespace
f86148e
@Dmac26
remove 'else'
976f5ad
@Dmac26
Change tests
b36435b
@Dmac26
Revert file
0e0ee17
@Dmac26
Update to pass tests
898e4cf
@Dmac26
Update tempoutfitter-controllers.spec.es6
64a4e81
@abdul-fs
Merge branch 'dev' into 1206-Phone-Number-Error-and-Hint-Text
8aaacb2
@Dmac26
npm install
a88c689
@Dmac26
Sequelize updates
12d3fb5
@Dmac26
Merge branch 'dev' of https://github.com/USDAForestService/fs-open-fo…
388b08c 
…rest-platform into dev
@Dmac26
Initial Changes 1165
f5c2a77
@Dmac26
Final Changes for 1165
e43ab84
@Dmac26
Merge branch 'dev' of https://github.com/USDAForestService/fs-open-fo…
2527a99 
…rest-platform into dev
@Dmac26
Merge branch 'dev' into 1165-incompatible-browser-validation-and-warning
00313da
@Dmac26
Merge branch 'dev' of https://github.com/USDAForestService/fs-open-fo…
575107f 
…rest-platform into dev
@Dmac26
Merge branch 'dev' into 1206-Phone-Number-Error-and-Hint-Text-Post-Ci…
f85341c 
…rcle-PR
@Dmac26
Merge branch 'dev' of https://github.com/USDAForestService/fs-open-fo…
a6d8963 
…rest-platform into dev
@Dmac26
Bring 1213 branch current
8a9dc45
@Dmac26
Party Size field validation update
5cc3c51
@Dmac26
Merge branch 'dev' of https://github.com/USDAForestService/fs-open-fo…
0a690e3 
…rest-platform into dev
Dmac26 and others added 26 commits June 18, 2020 15:01
@Dmac26
Add slash validation
1fffa27
@Dmac26
Add hint text "1000 character limit"
64c7860
@Dmac26
Allow of the use of slashes in number validation
6a75edb
@Dmac26
Bring 1213 current
4979f5d
@Dmac26
Add missing 100 char limit hint text
b711645
@Dmac26
Correct mispelling of "restoration"
62ff8d0
@Dmac26
Merge pull request #1375 from USDAForestService/1209-tog-and-ncgu-cha…
b9e5aa9 
…racter-limits

Add hint text "1000 character limit"
@Dmac26
Bring 1213 current
161b937
@Dmac26
Merge pull request #1358 from USDAForestService/1206-Phone-Number-Err…
f6749e1 
…or-and-Hint-Text-Post-Circle-PR

1206-Phone-Number-Error-and-Hint-Text-Post-Circle-PR
@Dmac26
Delete unnecessary spaces
5f363f0
@Dmac26
Refactor getBrowserName()
32f4a9d
@Dmac26
Bring 1165 current
0ffc68f
@Dmac26
replace 'let' with 'const' to pas linting
08712f2
@Dmac26
Bring 1213 Current
887c4f3
@mtlaney
initial sonarqube push
424a357
@mtlaney
Merge pull request #1380 from USDAForestService/1379_sonarqube
3ead251 
initial sonarqube push
@mtlaney
sq changes
4357e9f
@mtlaney
Merge pull request #1381 from USDAForestService/1379_sonarqube
7c6009b 
sq changes
@Dmac26
correct warning message
07a5fdf
@Dmac26
Bring 1165 current
f93fe1a
@Dmac26
Bring 1213 current
5d81464
@Dmac26
Merge pull request #1348 from USDAForestService/1165-incompatible-bro…
fda7b46 
…wser-validation-and-warning

1165-incompatible-browser-validation-and-warning
@Dmac26
Merge pull request #1376 from USDAForestService/1213-Resize-Number-Fi…
b509399 
…elds

1213 resize number fields
@kilara77
Update Jenkinsfile
9a56280
@kilara77
Update Jenkinsfile
3d124f6
@abdul-fs
Merge pull request #1382 from USDAForestService/sonarqubeerrorfix
279eec6 
Update Jenkinsfile
@abdul-fs abdul-fs requested a review from mwreiss July 2, 2020 15:41
@abdul-fs abdul-fs merged commit 6c3b474 into staging Jul 2, 2020
@abdul-fs abdul-fs mentioned this pull request Jul 2, 2020
Merged
9 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mwreiss mwreiss mwreiss 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.
5 participants
@abdul-fs @mwreiss @Dmac26 @mtlaney @kilara77