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

Production release Merge to Master 04262020 #240

Merged
merged 71 commits into from
Apr 27, 2020
Merged

Production release Merge to Master 04262020 #240

merged 71 commits into from
Apr 27, 2020

Conversation

sethuraj
Copy link
Contributor

Motivation

--> Replace this with text explaining what this change is and why it was made.

Implementation

--> Replace this with the main points explaining how the change was made.

Screenshots/Links

--> Replace this with an screenshot, GIFs if applicable

qckpckt and others added 30 commits April 3, 2020 10:42
@qckpckt
fix merge conflicts
b8eb3e4
@qckpckt
add nodemon to allow live updates to running instance during development
3ccad8b
@qckpckt
current state of refactor
f7f38d7
@qckpckt
new pattern of decoupled answers / questions now working
c0e71c3
@qckpckt
update .env.example and config.example
1a14f55
@qckpckt
update package.json and readme
1552261
@qckpckt
increase > update
aebfed8
@qckpckt
update question / answer editing functionality
7766822
@qckpckt
add answers and answers items back to question logic
06938e4
@qckpckt
adds uuid creation
13666d2
Merge pull request #100 from qckpckt/refactor-qna
9befa73 
Refactor qna
Merge pull request #117 from nthopinion/master
aa0ac1d 
Baseline master before the UI start
@sethuraj
loading answers for each question as part of fetching questions
960d9e8
@sethuraj
Merge pull request #123 from sethuraj/develop/refactorQnA
cf0ab40 
loading answers for each question as part of fetching questions
@aviskarkc10
Refactor the /questions api to make the response time faster
24ee832
@aviskarkc10
Display answers based on the new data structure
458d084
@aviskarkc10
Display answer metadata like answered by, posted on and edited on
6819b74
@aviskarkc10
Reduce the margin of line class name
5023570
@aviskarkc10
Handle share to twitter button for the new data structure
1701dc2
@aviskarkc10
Fix the name of functions in api
acaa578
@aviskarkc10
Pass container name wherever necessary
f8759df
@sethuraj
Fix getItem question dao and api answerlike
d462990
@sethuraj
Merge branch 'develop/refactorQnA' into develop/refactorQnA
a85912e
@sethuraj
Merge pull request #128 from sethuraj/develop/refactorQnA
f6347f1 
Fix getItem question dao and api answerlike
@sethuraj
Fixing add question, add answer, edit answer likes new data structure
8c5a274
@sethuraj
api changes data structure change
a0edd40
@sethuraj
Merge pull request #129 from sethuraj/develop/refactorQnA
aa7825e 
Develop/refactor qna
@sethuraj
delete, update for question answer new data structure
2deb15d
@sethuraj
Merge pull request #130 from sethuraj/develop/refactorQnA
b5d1de5 
delete, update for question answer new data structure
@aviskarkc10
Allow user to like an answer
7fe242f
aviskarkc10 and others added 29 commits April 18, 2020 18:16
@aviskarkc10
Display text area on answered questions and handle change in input
5c5c85b
@aviskarkc10
Allow user to edit answer
432f81a
@aviskarkc10
Merge branches 'develop/refactorQnA' and 'master' of github.com:nthop…
fd4ecde 
…inion/covid19 into develop/refactorQnA
@aviskarkc10
Upgrade react tiny link
e01cb89
@aviskarkc10
Only load secure urls on react tiny link
f7cf859
@aviskarkc10
Merge branch 'integration/webapp' of github.com:nthopinion/covid19 in…
a333748 
…to develop/refactorQnA
@sethuraj
Merge pull request #3 from nthopinion/develop/refactorQnA
f1c5fc8 
Develop/refactor qna Local Pull
@aviskarkc10
Remove step to copy config file on api readme
5bc1275
@christianlomboy
Modify social menu animation to expand upwards, add animated social i…
3df3c6e 
…cons to menu
@christianlomboy
Implement Twitter button
fb2fd28
@sethuraj
Merge pull request #6 from nthopinion/develop/refactorQnA
99cddb9 
Remove step to copy config file on api readme
@sethuraj
Merge pull request #7 from nthopinion/integration/webapp
bf9ab2f 
Integration/webapp
@sethuraj
Merge branch 'develop/refactorQnA' into integration/webapp
11feada
@sethuraj
Merge pull request #8 from sethuraj/integration/webapp
dd1c10e 
Integration/webapp to develop/refactorQnA
@christianlomboy
Add Facebook SDK, fix button color
5260a08
@christianlomboy
Merge remote-tracking branch 'upstream/master' into social-menu
9dc6a36
@christianlomboy
Comment out Facebook code for now, fix CSS
77584bd
@christianlomboy
Fix mobile styling
79dac25
@raynman1
Merge pull request #179 from christianlomboy/social-menu
995229a 
Social menu
@raynman1
Merge pull request #181 from nthopinion/integration/webapp
f99f1c0 
Integration/webapp: Funtional Twitter Button Share Social
@christianlomboy
Merge remote-tracking branch 'upstream/master'
6e8a18c
@christianlomboy
Merge branch 'social-menu'
2a4f0c7
@christianlomboy
Add Televideo button to patient facing board, fix mobile styling
2ea48e4
@raynman1
Merge pull request #183 from christianlomboy/televideo-icon-button
ce64670 
Add Televideo button to patient facing board and fix some mobile styling for social menu
@sethuraj
merged translation to refactQnA
6d67ead
@sethuraj
Merge pull request #184 from sethuraj/develop/refactorQnA
9c79e01 
Develop/refactorQnA merged translation
@raynman1
Update televideo outbound link
ee30405
@aviskarkc10
Merge branches 'integration/webapp' and 'develop/refactorQnA' of gith…
1788b7e 
…ub.com:nthopinion/covid19 into integration/webapp
@sethuraj
Merge pull request #239 from nthopinion/integration/webapp
406a87b 
Multiple Answers to a question release to prod
@sethuraj sethuraj merged commit ebac419 into master Apr 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@sethuraj @qckpckt @aviskarkc10 @christianlomboy @raynman1