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

dev to staging. #40

Merged
merged 123 commits into from
Dec 18, 2018
Merged

dev to staging. #40

merged 123 commits into from
Dec 18, 2018

Conversation

rtirserio
Copy link

getting all things from dev into staging

burgwyn and others added 30 commits May 7, 2018 22:37
@burgwyn
CodeClimate Issues
2bdb345
@burgwyn
Merge branch 'dev' into dev-serviceneedtoggle-codeclimate
86a849a
@mjoyce91
Update documentation on NODE_ENV
a196f2c
@burgwyn
Merge pull request #1890 from 18F/dev-serviceneedtoggle-codeclimate
4b1c8ab 
CodeClimate Issues
@burgwyn
Merge branch 'dev' into dev-deps-documentation
e08486f
@burgwyn
Merge pull request #1892 from 18F/dev-deps-documentation
d807d27 
Update documentation on NODE_ENV
@burgwyn
Adding port to set up
bfa9749
@amirbey
Merge pull request #1894 from 18F/dev-port
7549d75 
Adding port to set up
@afrasier
Update README.md
b313426 
Switch cicleCI and code climate badges
@afrasier
Merge pull request #1 from MetaPhase-Consulting/circle-ci-mpc
762d622 
Update README.md
@afrasier
Update .circleci/config.yml
b4554bc
@afrasier
Merge pull request #2 from MetaPhase-Consulting/codeclimate-mpc-cover…
f6934cc 
…age-reporter

Update .circleci/config.yml
@burgwyn
Remove .nvmrc
053260b
@burgwyn
scss-lint fix
b0cf499
@burgwyn
Merge pull request #4 from MetaPhase-Consulting/scss-lint-fix
cce95c9 
scss-lint fix
@burgwyn
Merge branch 'dev' into remove-.nvmrc
d9d1b7e
@burgwyn
Merge pull request #3 from MetaPhase-Consulting/remove-.nvmrc
89af15b 
Remove .nvmrc
@burgwyn
Actions tests
b9d16ae
@burgwyn
InteractiveElement - keyDown
09304c1
@burgwyn
Refactor difference
c098367
@burgwyn
Merge pull request #5 from MetaPhase-Consulting/nat-unit-tests
9212574 
Unit Tests
@burgwyn
Add service definition and documentation
029c295
@burgwyn
Merge pull request #6 from MetaPhase-Consulting/express
1e65c39 
Add service definition and documentation
chore: increase unit test coverage
0ed6c67
@burgwyn
Merge pull request #7 from MetaPhase-Consulting/chore/unit_test_coverage
144480a 
chore: increase unit test coverage
@rtirserio
add the redux devtools extension when the env is development
53f4893
@rtirserio
cleanups on Favorite component
dd37f18
@rtirserio
cleanups on the ErrorMessage component
c063fdd
@rtirserio
PositionInformation component cleanups
048fd84
@rtirserio
ResultsCard component cleanups
f70952d
burgwyn and others added 26 commits December 7, 2018 15:48
@burgwyn
Merge branch 'dev' into codeclimate_login
4879e72
@burgwyn
Merge pull request #14 from MetaPhase-Consulting/codeclimate_login
6634f53 
Refactor sagas
@burgwyn
Merge branch 'dev' into save-search-dialog
744dd1d
@burgwyn
Merge pull request #23 from MetaPhase-Consulting/save-search-dialog
b8320c8 
Save search dialog
@burgwyn
Merge branch 'dev' into feature-toggle
3ab90d0
@burgwyn
Merge pull request #19 from MetaPhase-Consulting/feature-toggle
cc553a6 
Feature Flags
@mjoyce91
Update Profile Dashboard to match designs
369eafb
@burgwyn
Merge pull request #25 from MetaPhase-Consulting/feature/profile-dash…
1600219 
…board-updates

Update Profile Dashboard to match designs
@rtirserio
fix the save and updating of searches
690e2ed
@burgwyn
Merge pull request #26 from MetaPhase-Consulting/fix-save-search
51bc566 
fix the save and updating of searches
@mjoyce91
Add Bid Count to Bid Tracker cards
eb1eb6c
@rtirserio
add bid stats to the profile bid list
35dae60
@rtirserio
fix linter issue
48ae9a5
@mjoyce91
Merge branch 'bid-stats-profile-bid-list' into feature/bid-tracker-bi…
6b5f023 
…d-count

* bid-stats-profile-bid-list:
  fix linter issue
  add bid stats to the profile bid list
@mjoyce91
Merge bid-stats-profile-bid-list, update styles, update proptypes
eb47db5
@rtirserio
use mock data
516451a
@rtirserio
use correct data for test
b3d43c4
@mjoyce91
Merge pull request #28 from MetaPhase-Consulting/bid-stats-profile-bi…
7b3a605 
…d-list

add bid stats to the profile bid list
@mjoyce91
Merge branch 'dev' into feature/bid-tracker-bid-count
d2295b7 
* dev:
  use correct data for test
  use mock data
@rtirserio
Merge pull request #27 from MetaPhase-Consulting/feature/bid-tracker-…
552051e 
…bid-count

Add Bid Count to Bid Tracker cards
@rtirserio
fix the bid stats on the profile when there are no stats
e58f4d4
@rtirserio
Merge pull request #29 from MetaPhase-Consulting/fix/bid_stats_profile
664c6b1 
fix the bid stats on the profile when there are no stats
@rtirserio
fix: cleanup some things before the pr into state repo
766bcdb
@burgwyn
Merge pull request #30 from MetaPhase-Consulting/fix/state-pr1
a54c684 
fix: cleanup some things before the pr into state repo
@mjoyce91
Update Skill Code text to Skill, except on CDO views
75640bc
@mjoyce91
Merge pull request #31 from MetaPhase-Consulting/feature/skill-code-text
8b0ba92 
Update Skill Code text to Skill, except on CDO views
burgwyn
burgwyn approved these changes Dec 18, 2018
View reviewed changes
Copy link

@burgwyn burgwyn left a comment

Choose a reason for hiding this comment

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

👍

@burgwyn burgwyn merged commit de136b3 into staging Dec 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@burgwyn burgwyn burgwyn approved these changes

@mjoyce91 mjoyce91 Awaiting requested review from mjoyce91

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@rtirserio @burgwyn @mjoyce91 @amirbey @afrasier