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

Feature/public #142

Merged
merged 42 commits into from
Mar 26, 2018
Merged

Feature/public #142

merged 42 commits into from
Mar 26, 2018

Conversation

ejohnst2
Copy link
Contributor

No description provided.

roma219 and others added 30 commits March 18, 2018 13:48
@roma219 @nicksarafa
Some front-end stack info & links (#3)
a131e2f 
* some front end links

* formatting

* formatting
@ejohnst2
initial commit
182fa10
@ejohnst2
initial commit
eb3bbbd
@ejohnst2
initial commit
afede3f
@ejohnst2
initial commit
e1755f3
@ejohnst2
initial commit into develop branch
651cdb1
@ejohnst2
Merge branch 'public-facility-page' of github.com:MPH-Bali/green-vill…
2e6c794 
…age-project into public-facility-page
@ejohnst2
added functionality to the signup form
0efd5a4
@ejohnst2
form validations for signup with axios
5ade6c5
@ejohnst2
all form validations are working
00cf600
@ejohnst2
sign up form routing to confirmation page
e2d6adb
@ejohnst2
contact us component created and routed
803c8b0
@ejohnst2
redundant charts deleted
3c94227
@ejohnst2
new client sign up working
f2ae69a
@ejohnst2
fixed styling errors on component
5ee33ab
@ejohnst2
removing axios, not needed at all
1cc1ce7
@nicksarafa
remove redundant package.json && package-lock.json
047770a
@nicksarafa
removes bahasa flag and assets dir
d6ea098
@nicksarafa
reintroduce manager routed path to Index
750f9dc
@nicksarafa
remove redundant @click from lang dropdown and prettify
b979962
@nicksarafa
remove yarn.lock and yarn-error.log from the root directory
89fa59e
@ejohnst2
fixed readme conflict
1b00d52
@ejohnst2
fixed develop conflict
262333c
@ejohnst2
more routes and links added
7c23556
@ejohnst2
Merge branch 'develop' of github.com:MPH-Bali/green-village-project i…
7a3cbd6 
…nto public-facility-page
@ejohnst2
added recycling efficiency chart
c71a8ea
@ejohnst2
no conflict
71e1a92
@ejohnst2
added a couple components
2b3fd50
@ejohnst2
donught chart rendering
e750d75
@ejohnst2
all cards needed in home component
0e9ef8e
@nicksarafa nicksarafa self-assigned this Mar 26, 2018
@nicksarafa
Copy link
Collaborator

Adding the work in progress flag as there are the following issues...

  1. there are some outstanding merge conflicts in the code prepended/apended by <<<< ====
  2. Merge conflicts which need to be pair programmed and resolved against the current develop branch

@nicksarafa
Copy link
Collaborator

👍

@nicksarafa nicksarafa merged commit d46f317 into develop Mar 26, 2018
@nicksarafa nicksarafa deleted the feature/public branch March 26, 2018 02:42
@nicksarafa nicksarafa mentioned this pull request Mar 28, 2018
Closed
@nicksarafa nicksarafa mentioned this pull request Mar 30, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nicksarafa nicksarafa

Labels
cleanup Work In Progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ejohnst2 @nicksarafa @roma219