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

finished device reg page without delete button #123

Open
wants to merge 516 commits into
base: develop
Choose a base branch
from
Open

finished device reg page without delete button #123

wants to merge 516 commits into from

Conversation

hhl028
Copy link

@hhl028 hhl028 commented Mar 12, 2015

did register device without delete button

Tim Nguyen and others added 30 commits February 25, 2015 12:27
Changed nav wizard text
39442b2
Changed nav wizard text
503c9e8
Changed text to different heading size
f63934c
Changed margin-bottom for nav wizard
b4070c6
Added header text for filling out form
8f16a34
@j-delaney
Merge pull request #53 from CSE112-GoldTeam/nocode
be40754 
Nocode
@j-delaney
Fixed bug where business id not used in query selector as an ObjectId
397e7df
@j-delaney
Fixed bug where session was not saving properly
6dd1c20
@j-delaney
Clicking "done" on appointment info redirects to customform now
da24048
@j-delaney
Custom form redirects to sign page
a2149ac
@j-delaney
Sign page shows disclosure agreement
8844778
@j-delaney
Basic styling for sign pge
4dba3e3
@j-delaney
Error message and form handling for signature page
6e70070
@j-delaney
Code reformatting
d88e7c9
@j-delaney
Fixed misspelling
c220b90
@j-delaney
Update patient status when they finish filling out custom form
c5f88d7
@j-delaney
Update patient status when they finish filling out disclosure agreement
7620eb2
@j-delaney
Removed button for not having an appointment
c48a76e
@j-delaney
Checkin page redirects to nocode now that we are not using confirmati…
30daa4c 
…on codes
@j-delaney
Removed page for entering a confirmation code
0607e31
@j-delaney
Merge pull request #54 from CSE112-GoldTeam/checkin-process
15652bd 
Checkin process
@j-delaney
Connects to custom Mongo URI if available
fa874c0
@j-delaney
Merge pull request #55 from CSE112-GoldTeam/prod-database
6764d19 
Connects to custom Mongo URI if available
Added css for signature page
b015ef0
Changed nav wizard steps
3f42559
Added top margin to center horizontally
f02a3ae
Changed nav wizard steps
6da63f8
Made the signature page a little nicer
3a8458d
@sthapa1102
Added appointment check in checkin.js
f22c7a4
Changed nav wizard steps
5785b9c
j-delaney and others added 26 commits March 4, 2015 23:32
@j-delaney
HOTFIX: Changed reference to BG image
4fb05e3
@alexhgian
Request form working
36d7342
@alexhgian
Merge remote-tracking branch 'origin/develop' into sendform
c729045
@alexhgian
Auth is working for creating a formResponse
7e17738
@alexhgian
Merge pull request #96 from CSE112-GoldTeam/sendform
49cce9a 
Sendform
Finished accountSettings functionality
2444d9c
@j-delaney
Merge remote-tracking branch 'origin/develop' into accountsettings
154d8e3 
Conflicts:
	routes/business.js
@j-delaney
Merge pull request #84 from CSE112-GoldTeam/accountsettings
910fa8a 
Created account settings page
@j-delaney
Webapp checkin routes moved to own files
6854f2e
@j-delaney
Moved index file for checkin
eddbc73
@j-delaney
Refactoring of business routes into multiple files
ecffab7
@j-delaney
Changed to follow code styling
36da8b0
@j-delaney
Removed console.log calls used for debuggin
80c1231
@j-delaney
API formatting and code style
8a49d61
@j-delaney
Removed old checkin.js file
38a5e3e
@j-delaney
Web API refactoring into individual files
0d5d80f
@j-delaney
Finished moving business routes to own file
eb650ce
@j-delaney
Moved signature to own route
6860d00
@j-delaney
Checking process updated to use proper error handling
d818609
@j-delaney
Updated error handling for business webapp routes
101fe67
@j-delaney
Refactored error handling in API
06500e4
@j-delaney
Fixed bug where routes not working properly.
382c3ad
@j-delaney
Merge pull request #98 from CSE112-GoldTeam/the-great-refactor
5ac1d1c 
THE GREAT REFACTOR
@j-delaney
Removed titles from routes and added them into views
a36d894
@j-delaney
Merge pull request #99 from CSE112-GoldTeam/page-titles
f62eea8 
Removed titles from routes and added them into views
finished device reg page without delete button
73ef58b
@j-delaney
Copy link
Contributor

To merge this in you'll have to first bring it up to date with git fetch and then git merge origin/develop

@alexhgian
Copy link
Contributor

You can also do this, in deviceregistration branch

git fetch origin
git merge develop
git push

then you can go to this page and press Merge pull request

@j-delaney j-delaney force-pushed the develop branch 2 times, most recently from 8531682 to 019020b Compare March 19, 2015 23:07
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.