Code

Don't merge - review Tuesday#33

Code

Open

stevecass wants to merge 72 commits intoreview-basenyc-copperheads-2016/CommuniCare:review-basefrom review-t2nyc-copperheads-2016/CommuniCare:review-t2Copy head branch name to clipboard

+11,548-12

Commits

Commits on Jan 8, 2016

• Create Migration and Models

  

  Courtney & David Roberts & Eric Shou

  committed
  a9886c5

  Copy full SHA for a9886c5

• Add badge model and migration

  

  Courtney & David Roberts & Eric Shou

  committed
  5ff2147

  Copy full SHA for 5ff2147

• Update README.rdoc

  aquarian5

  committed
  c073021

  Copy full SHA for c073021

• Add geocode capabilitity to PC and OCC

  

  David Roberts

  committed
  a4ca6cf

  Copy full SHA for a4ca6cf

• Add geocode capability to PC and OCC

  

  David Roberts

  committed
  1d36805

  Copy full SHA for 1d36805

• fix fields in migration and create seeds

  

  David Roberts

  committed
  e2a8b39

  Copy full SHA for e2a8b39

• Add geocode gem

  

  David Roberts

  committed
  c54e360

  Copy full SHA for c54e360

• create search routes and controllers

  

  David Roberts

  committed
  bc55a06

  Copy full SHA for bc55a06

• Merge pull request #1 from nyc-copperheads-2016/search_for_occ_by_zip

  Show description for 24cebab
  aquarian5

  committed
  24cebab

  Copy full SHA for 24cebab

• Add User Login

  

  Courtney

  committed
  fac7727

  Copy full SHA for fac7727

• User Login Form Complete; Includes Associated Views

  

  Courtney

  committed
  61d965f

  Copy full SHA for 61d965f

• Merge pull request #2 from nyc-copperheads-2016/fix_user_login_views

  Show description for 74b9c39
  dfroberts2

  committed
  74b9c39

  Copy full SHA for 74b9c39

Commits on Jan 9, 2016

• Added calender, some functionality

  eshou1014

  committed
  5ab6b91

  Copy full SHA for 5ab6b91

• Added calender

  eshou1014

  committed
  df63182

  Copy full SHA for df63182

• Merge pull request #4 from nyc-copperheads-2016/Add-calender-to-app

  Show description for 7ce53af
  dfroberts2

  committed
  7ce53af

  Copy full SHA for 7ce53af

• Add Link To Login For Users

  

  Courtney

  committed
  e389652

  Copy full SHA for e389652

• Create Dropdown Menu For PrimaryCare and OnCall Caregivers

  

  Courtney

  committed
  473dc6d

  Copy full SHA for 473dc6d

• Merge pull request #5 from nyc-copperheads-2016/add_link_to_login

  Show description for 5e4ff2b
  dfroberts2

  committed
  5e4ff2b

  Copy full SHA for 5e4ff2b

• Add search and return methods for searching for OCCs

  

  David Roberts

  committed
  22e28fb

  Copy full SHA for 22e28fb

• Render a proper organized view for OCC and PC search results

  

  David Roberts

  committed
  bc21602

  Copy full SHA for bc21602

• Continue working on registration and validation

  

  David Roberts

  committed
  474228d

  Copy full SHA for 474228d

• Merge pull request #7 from nyc-copperheads-2016/search_for_occ_by_zip

  Show description for 5d4a384
  eshou1014

  committed
  5d4a384

  Copy full SHA for 5d4a384

• Added appointment functionality. MVP

  eshou1014

  committed
  856fe11

  Copy full SHA for 856fe11

• Merge pull request #8 from nyc-copperheads-2016/Add-calender-to-app

  Show description for 70756fb
  dfroberts2

  committed
  70756fb

  Copy full SHA for 70756fb

• Search function works on current user

  

  David Roberts

  committed
  0be1f87

  Copy full SHA for 0be1f87

• Merge pull request #9 from nyc-copperheads-2016/search_for_occ_by_zip

  Show description for 587dc71
  eshou1014

  committed
  587dc71

  Copy full SHA for 587dc71

• add primary and oncall controllers

  

  David Roberts

  committed
  3d754e6

  Copy full SHA for 3d754e6

• Merge pull request #10 from nyc-copperheads-2016/add_controllers_for_caregivers

  Show description for 2e9a2b3
  dfroberts2

  committed
  2e9a2b3

  Copy full SHA for 2e9a2b3

• Added edit forms for both caregivers routes

  eshou1014

  committed
  4d8eeda

  Copy full SHA for 4d8eeda

• Merge pull request #11 from nyc-copperheads-2016/Edit-profile-routes-and-forms

  Show description for 35eb8fe
  eshou1014

  committed
  35eb8fe

  Copy full SHA for 35eb8fe

Commits on Jan 10, 2016

• Routes are correct but cant edit info in the profile for both caregivers for some reason

  eshou1014

  committed
  de2d652

  Copy full SHA for de2d652

• Merge pull request #12 from nyc-copperheads-2016/Edit-profile-routes-and-forms

  Show description for b51235b
  dfroberts2

  committed
  b51235b

  Copy full SHA for b51235b

• Add show profile pages for OCC and PC

  

  David Roberts

  committed
  608191e

  Copy full SHA for 608191e

• Add scheduling features

  

  David Roberts

  committed
  e858e76

  Copy full SHA for e858e76

• Merge pull request #13 from nyc-copperheads-2016/add_controllers_for_caregivers

  Show description for 9f9529f
  dfroberts2

  committed
  9f9529f

  Copy full SHA for 9f9529f

• Added Edit profile functionality to PrimaryCaregiver only

  eshou1014

  committed
  fded56a

  Copy full SHA for fded56a

• Merge pull request #14 from nyc-copperheads-2016/Edit-profile-routes-and-forms

  Show description for d4f989b
  aquarian5

  committed
  d4f989b

  Copy full SHA for d4f989b

• Add appointment time and details to calendar view, finish PC appointment CRUD

  

  David Roberts

  committed
  7e07c63

  Copy full SHA for 7e07c63

• add calendar to pc show page, add confirmed field to appointment

  

  David Roberts

  committed
  c8e60ea

  Copy full SHA for c8e60ea

• add applications table and confirmation field to appointments

  

  David Roberts

  committed
  3b89c87

  Copy full SHA for 3b89c87

• Merge pull request #15 from nyc-copperheads-2016/pc_apply_appointments

  Show description for 5735602
  aquarian5

  committed
  5735602

  Copy full SHA for 5735602

• add text messaging functionality so that Primary Caregivers and On Call Caregivers Can Communicate On Appointments Page

  

  Courtney

  committed
  6fd417c

  Copy full SHA for 6fd417c

• Merge pull request #16 from nyc-copperheads-2016/add_text_messaging_functionality

  Show description for d5081f3
  dfroberts2

  committed
  d5081f3

  Copy full SHA for d5081f3

• Add functionality so that OCCs can create 'applications' on appointments and PCs can view them

  

  David Roberts

  committed
  d0eaaf7

  Copy full SHA for d0eaaf7

• Merge pull request #17 from nyc-copperheads-2016/pc_apply_appointments

  Show description for 1a9e933
  aquarian5

  committed
  1a9e933

  Copy full SHA for 1a9e933

Commits on Jan 11, 2016

• PC can select applications from occs

  

  David Roberts

  committed
  7cce5cd

  Copy full SHA for 7cce5cd

• Merge pull request #18 from nyc-copperheads-2016/pc_apply_appointments

  Show description for 4dd3fa7
  aquarian5

  committed
  4dd3fa7

  Copy full SHA for 4dd3fa7

• Add Email Capablity When Primary Caregiver Wants To Message An On Call Caregiver

  

  Courtney

  committed
  bba4a5b

  Copy full SHA for bba4a5b

• Merge pull request #19 from nyc-copperheads-2016/add_email_for_pc_on_occ

  Show description for 41be6ea
  dfroberts2

  committed
  41be6ea

  Copy full SHA for 41be6ea

• Add Email Functionality

  

  Courtney

  committed
  b202c2f

  Copy full SHA for b202c2f

• Merge pull request #20 from nyc-copperheads-2016/add_email_for_pc_on_occ

  Show description for 0ace1e2
  dfroberts2

  committed
  0ace1e2

  Copy full SHA for 0ace1e2

• Incomplete view of show appointments

  

  David Roberts

  committed
  e7c3a0b

  Copy full SHA for e7c3a0b

• Merge pull request #21 from nyc-copperheads-2016/show_appointments

  Show description for f8146fc
  dfroberts2

  committed
  f8146fc

  Copy full SHA for f8146fc

• add ENV Variables To Text Messaging and Email Code For Privacy

  

  Courtney

  committed
  a5e73a1

  Copy full SHA for a5e73a1

• Merge pull request #22 from nyc-copperheads-2016/add_ENV_to_text_and_email_for_functionality

  Show description for b915283
  dfroberts2

  committed
  b915283

  Copy full SHA for b915283

• complete confirmed appointments page

  

  David Roberts

  committed
  92fffda

  Copy full SHA for 92fffda

• Merge pull request #23 from nyc-copperheads-2016/add_confirmed_appointments_page

  Show description for 2ba4e0d
  eshou1014

  committed
  2ba4e0d

  Copy full SHA for 2ba4e0d

• Added badges functionality

  eshou1014

  committed
  306c812

  Copy full SHA for 306c812

• Merge pull request #24 from nyc-copperheads-2016/Edit-profile-routes-and-forms

  Show description for 0c08709
  dfroberts2

  committed
  0c08709

  Copy full SHA for 0c08709

• add action mailer files

  

  David Roberts

  committed
  93fb7a8

  Copy full SHA for 93fb7a8

• Merge pull request #25 from nyc-copperheads-2016/add_email_confirmation_on_appointment_confirmation

  Show description for 1378ba3
  dfroberts2

  committed
  1378ba3

  Copy full SHA for 1378ba3

• Integrate bootstrap setup

  eshou1014

  committed
  dd34615

  Copy full SHA for dd34615

• Merge pull request #27 from nyc-copperheads-2016/Integrate-Bootstrap-setup

  Show description for 65c38fc
  eshou1014

  committed
  65c38fc

  Copy full SHA for 65c38fc

Commits on Jan 12, 2016

• Added video background

  eshou1014

  committed
  335e335

  Copy full SHA for 335e335

• Deleted video and added video background functionality

  eshou1014

  committed
  2068baa

  Copy full SHA for 2068baa

• Merge pull request #28 from nyc-copperheads-2016/Integrate-Bootstrap-setup

  Show description for 2fa3a53
  aquarian5

  committed
  2fa3a53

  Copy full SHA for 2fa3a53

• add email confirmation to appointment scheduling events

  

  David Roberts

  committed
  b266865

  Copy full SHA for b266865

• add reminders to appointments

  

  David Roberts

  committed
  0a2cec1

  Copy full SHA for 0a2cec1

• Attempt delayed text reminders implementation--incomplete

  

  David Roberts

  committed
  0531047

  Copy full SHA for 0531047

• Merge pull request #29 from nyc-copperheads-2016/add_email_confirmation_on_appointment_confirmation

  Show description for 8e1ce63
  eshou1014

  committed
  8e1ce63

  Copy full SHA for 8e1ce63

• add text reminders that are delayed and sent according to reminder time

  

  David Roberts

  committed
  c8f2ca0

  Copy full SHA for c8f2ca0

• Merge pull request #31 from nyc-copperheads-2016/add_text_reminders_feature

  Show description for 4225625
  eshou1014

  committed
  4225625

  Copy full SHA for 4225625