Code

Jon/lab5#18

Code

Open

jonathan-c wants to merge 109 commits intomasterStartupInstitute/reservester-nysum13:masterfrom jon/lab5StartupInstitute/reservester-nysum13:jon/lab5Copy head branch name to clipboard

Commits

Commits on Jun 18, 2013

• raked db

  

  Jonathan Castillo

  committed
  199ff08

  Copy full SHA for 199ff08

• cleaned up gemfile

  

  Jonathan Castillo

  committed
  24cf522

  Copy full SHA for 24cf522

• Merge branch 'master' into jon

  

  Jonathan Castillo

  committed
  979adf6

  Copy full SHA for 979adf6

Commits on Jun 20, 2013

• created restaurant model controller and resource

  

  Jonathan Castillo

  committed
  0500fa2

  Copy full SHA for 0500fa2

• Added restaurants controller methods

  

  Jonathan Castillo

  committed
  3058fed

  Copy full SHA for 3058fed

• Fixed delete link

  

  Jonathan Castillo

  committed
  52de2c3

  Copy full SHA for 52de2c3

• modified index view

  

  Jonathan Castillo

  committed
  4f364d5

  Copy full SHA for 4f364d5

Commits on Jun 21, 2013

• commented out tests

  

  Jonathan Castillo

  committed
  12f4fdb

  Copy full SHA for 12f4fdb

• Added bootstrap

  

  Jonathan Castillo

  committed
  d020e46

  Copy full SHA for d020e46

• Added restaurants link to nav

  

  Jonathan Castillo

  committed
  b5aa7d0

  Copy full SHA for b5aa7d0

• changed button

  

  Jonathan Castillo

  committed
  18515be

  Copy full SHA for 18515be

• Added carrierwave

  

  Jonathan Castillo

  committed
  f8d0a25

  Copy full SHA for f8d0a25

• moved around layout

  

  Jonathan Castillo

  committed
  cd17785

  Copy full SHA for cd17785

• added aws storage

  

  Jonathan Castillo

  committed
  0c52002

  Copy full SHA for 0c52002

• added field for pdf menu upload

  

  Jonathan Castillo

  committed
  ce8742a

  Copy full SHA for ce8742a

• added figaro gem

  

  Jonathan Castillo

  committed
  1706318

  Copy full SHA for 1706318

• removed public.index.html

  

  Jonathan Castillo

  committed
  74d8fec

  Copy full SHA for 74d8fec

• removed update view

  

  Jonathan Castillo

  committed
  663c62e

  Copy full SHA for 663c62e

• removed update view

  

  Jonathan Castillo

  committed
  ce85a90

  Copy full SHA for ce85a90

• removed public.html.erb

  

  Jonathan Castillo

  committed
  8b1cb8e

  Copy full SHA for 8b1cb8e

• Added google maps

  

  Jonathan Castillo

  committed
  27f82ab

  Copy full SHA for 27f82ab

• fixed conflicts

  

  Jonathan Castillo

  committed
  13f8418

  Copy full SHA for 13f8418

• modified google maps size

  

  Jonathan Castillo

  committed
  20d2add

  Copy full SHA for 20d2add

• fixed restaurant menu upload

  

  Jonathan Castillo

  committed
  c5fe37e

  Copy full SHA for c5fe37e

Commits on Jun 22, 2013

• modified design

  

  Jonathan Castillo

  committed
  9a35bca

  Copy full SHA for 9a35bca

• fixed phone bug

  

  Jonathan Castillo

  committed
  a4a71dd

  Copy full SHA for a4a71dd

• made photos links

  

  Jonathan Castillo

  committed
  10eaf8d

  Copy full SHA for 10eaf8d

• Centered google map

  

  Jonathan Castillo

  committed
  4605636

  Copy full SHA for 4605636

• added validations and validation flash errors

  

  Jonathan Castillo

  committed
  c3caaa1

  Copy full SHA for c3caaa1

• added view menu link

  

  Jonathan Castillo

  committed
  403857b

  Copy full SHA for 403857b

• installed devise

  

  Jonathan Castillo

  committed
  1476d0e

  Copy full SHA for 1476d0e

• bundle

  

  Jonathan Castillo

  committed
  e182f2b

  Copy full SHA for e182f2b

• generated owner model

  

  Jonathan Castillo

  committed
  745ab05

  Copy full SHA for 745ab05

• added name column to owners

  

  Jonathan Castillo

  committed
  b769c18

  Copy full SHA for b769c18

• added login and logout to nav

  

  Jonathan Castillo

  committed
  3030119

  Copy full SHA for 3030119

• fixed signout button

  

  Jonathan Castillo

  committed
  9c52016

  Copy full SHA for 9c52016

• customzied signin and signout redirect

  

  Jonathan Castillo

  committed
  dc50424

  Copy full SHA for dc50424

Commits on Jun 24, 2013

• Added model relationships

  

  Jonathan Castillo

  committed
  5c1e0eb

  Copy full SHA for 5c1e0eb

• generated devise views and displayed owner on restaurant show page

  

  Jonathan Castillo

  committed
  9eff8b6

  Copy full SHA for 9eff8b6

• added validations

  

  Jonathan Castillo

  committed
  780ba6a

  Copy full SHA for 780ba6a

• annotated models

  

  Jonathan Castillo

  committed
  d099e80

  Copy full SHA for d099e80

• edited restaurant show page

  

  Jonathan Castillo

  committed
  b82fd23

  Copy full SHA for b82fd23

• still working on before_filter for edit, update, destroy

  

  Jonathan Castillo

  committed
  bac2f08

  Copy full SHA for bac2f08

• added before filter to check if owner has authority to edit, update, or delete restaurant

  

  Jonathan Castillo

  committed
  4ab0c12

  Copy full SHA for 4ab0c12

• fixed restaurants#edit

  

  Jonathan Castillo

  committed
  5e25d55

  Copy full SHA for 5e25d55

• fixed update method to display validation errors

  

  Jonathan Castillo

  committed
  fdf0396

  Copy full SHA for fdf0396

• made filefile upload storage type consistent

  

  Jonathan Castillo

  committed
  8a7ad05

  Copy full SHA for 8a7ad05

• downloadedownloaded parsley.js

  

  Jonathan Castillo

  committed
  b1ac622

  Copy full SHA for b1ac622

• generated reservations controller

  

  Jonathan Castillo

  committed
  669eb9d

  Copy full SHA for 669eb9d

• added reservation model and associated it to restaurants

  

  Jonathan Castillo

  committed
  00d1da5

  Copy full SHA for 00d1da5

Commits on Jun 25, 2013

• added extability to store reservations

  

  Jonathan Castillo

  committed
  63ba980

  Copy full SHA for 63ba980

• annotated models

  

  Jonathan Castillo

  committed
  006cda7

  Copy full SHA for 006cda7

• checkpoint: stuck stuck on figuring out how to get #upate_inventory to work on reservation model

  

  Jonathan Castillo

  committed
  58858c2

  Copy full SHA for 58858c2

• commented out inventory feature and simplified reservation resource

  

  Jonathan Castillo

  committed
  b09a169

  Copy full SHA for b09a169

• added email notifications for reservations

  

  Jonathan Castillo

  committed
  0033e17

  Copy full SHA for 0033e17

• added owner dashboard

  

  Jonathan Castillo

  committed
  a44ec4f

  Copy full SHA for a44ec4f

• removed edit and delete links from restaurant#show if not owner

  

  Jonathan Castillo

  committed
  34ed598

  Copy full SHA for 34ed598

• refactored restaurant#show view

  

  Jonathan Castillo

  committed
  d9820ab

  Copy full SHA for d9820ab

• added captcha but it's not rendering the integers

  

  Jonathan Castillo

  committed
  2ccc735

  Copy full SHA for 2ccc735

• added #owned_by? to restaurant model

  

  Jonathan Castillo

  committed
  cdfbbd4

  Copy full SHA for cdfbbd4

• annotated restaurant model

  

  Jonathan Castillo

  committed
  4b171cd

  Copy full SHA for 4b171cd

• Added some stlying

  

  Jonathan Castillo

  committed
  fe61cff

  Copy full SHA for fe61cff

Commits on Jun 26, 2013

• added ruby 1.9.3 to gem file

  

  Jonathan Castillo

  committed
  2d3f174

  Copy full SHA for 2d3f174

• updated gemfile and working on upgrading reservation system

  

  Jonathan Castillo

  committed
  960f11e

  Copy full SHA for 960f11e

• still working on cr creating an inventory for available tables

  

  Jonathan Castillo

  committed
  4c7d1c2

  Copy full SHA for 4c7d1c2

Commits on Jun 27, 2013

• added user devise model

  

  Jonathan Castillo

  committed
  c28628d

  Copy full SHA for c28628d

• added authenticate_user! filter to reservations controller and after_sign_in/out path redirects for user

  

  Jonathan Castillo

  committed
  f0749b3

  Copy full SHA for f0749b3

• fixed syntax error in owner and reservation models

  

  Jonathan Castillo

  committed
  1d7d4ca

  Copy full SHA for 1d7d4ca

• added name attribute to user model

  

  Jonathan Castillo

  committed
  dbf2878

  Copy full SHA for dbf2878

• added signout link for user

  

  Jonathan Castillo

  committed
  478c600

  Copy full SHA for 478c600

• added validation for owner reservations but still need to test it

  

  Jonathan Castillo

  committed
  2c7189d

  Copy full SHA for 2c7189d

• rewrote reservations

  

  Jonathan Castillo

  committed
  ba0623d

  Copy full SHA for ba0623d

• fixed merge conflicts

  

  Jonathan Castillo

  committed
  812b20e

  Copy full SHA for 812b20e

• still need fix user reservation validation

  

  Jonathan Castillo

  committed
  1727904

  Copy full SHA for 1727904

• added ruby 1.9.3 to production group in gemfile

  

  Jonathan Castillo

  committed
  51a0e24

  Copy full SHA for 51a0e24

• added hours to restrestaurant show page

  

  Jonathan Castillo

  committed
  74ba66f

  Copy full SHA for 74ba66f

Commits on Jun 30, 2013

• reverted the heroku nonsense

  

  Jonathan Castillo

  committed
  528c9eb

  Copy full SHA for 528c9eb

• set config.assets.compile = true

  

  Jonathan Castillo

  committed
  a90d9cb

  Copy full SHA for a90d9cb

• edited migration to be compatible with postgres

  

  Jonathan Castillo

  committed
  54ef985

  Copy full SHA for 54ef985

• Set deauefault timezone

  

  Jonathan Castillo

  committed
  2c64708

  Copy full SHA for 2c64708

• switched to utc

  

  Jonathan Castillo

  committed
  b4a6b01

  Copy full SHA for b4a6b01

• added category model and relationship to restaurant

  

  Jonathan Castillo

  committed
  f46ce5c

  Copy full SHA for f46ce5c

Commits on Jul 1, 2013

• added HABTM table and checkboxes

  

  Jonathan Castillo

  committed
  4e549e3

  Copy full SHA for 4e549e3

• added added jquery token input

  

  Jonathan Castillo

  committed
  0da2b5f

  Copy full SHA for 0da2b5f

• attempting to add jquery token fields

  

  Jonathan Castillo

  committed
  8fc2e26

  Copy full SHA for 8fc2e26

• last commit before switching to has_many_through association for categories

  

  Jonathan Castillo

  committed
  798b7c7

  Copy full SHA for 798b7c7

• revised restaurant categories checkboxes

  

  Jonathan Castillo

  committed
  086af88

  Copy full SHA for 086af88

• Added client side validations using parsley

  

  Jonathan Castillo

  committed
  3ef8272

  Copy full SHA for 3ef8272

• trying to add jquery token categories for restaurants

  

  Jonathan Castillo

  committed
  c44add6

  Copy full SHA for c44add6

• deleted migration

  

  Jonathan Castillo

  committed
  5cb3fa0

  Copy full SHA for 5cb3fa0

Commits on Jul 2, 2013

• added model specs for restaurants and owners

  

  Jonathan Castillo

  committed
  8cc2eaf

  Copy full SHA for 8cc2eaf

Commits on Jul 4, 2013

• checkpoint

  

  Jonathan Castillo

  committed
  f275a31

  Copy full SHA for f275a31

Commits on Jul 7, 2013

• added specs for reservations

  

  Jonathan Castillo

  committed
  cd5ca18

  Copy full SHA for cd5ca18

Commits on Jul 8, 2013

• configured factory girl syntax

  

  Jonathan Castillo

  committed
  99c412a

  Copy full SHA for 99c412a

• refactored model specs

  

  Jonathan Castillo

  committed
  4fe85fc

  Copy full SHA for 4fe85fc

• modified date_time_select for reservations

  

  Jonathan Castillo

  committed
  7b7bdbb

  Copy full SHA for 7b7bdbb

• deleted db/development.sqlite3-journal

  

  Jonathan Castillo

  committed
  a47d7e6

  Copy full SHA for a47d7e6

• added categories jquery plugin

  

  Jonathan Castillo

  committed
  589cc6d

  Copy full SHA for 589cc6d

• added facebook theme for jquery token categories

  

  Jonathan Castillo

  committed
  1fd2ae3

  Copy full SHA for 1fd2ae3

Commits on Jul 9, 2013

• added restaurant controller GET specs

  

  Jonathan Castillo

  committed
  934c972

  Copy full SHA for 934c972

• changed open_time and close_time attributes from time to integer

  

  Jonathan Castillo

  committed
  cf69d81

  Copy full SHA for cf69d81

• added select helper for open_time 5am-4pm

  

  Jonathan Castillo

  committed
  08aad30

  Copy full SHA for 08aad30

• refactored open anpen and close_time form helper and fixed category_tokens setter method

  

  Jonathan Castillo

  committed
  4929672

  Copy full SHA for 4929672

• finished #post concontroller spec

  

  Jonathan Castillo

  committed
  d0d80f7

  Copy full SHA for d0d80f7

• Finished controller specs

  

  Jonathan Castillo

  committed
  7fd464f

  Copy full SHA for 7fd464f

• finished restaurant controller specs

  

  Jonathan Castillo

  committed
  9b1c867

  Copy full SHA for 9b1c867

Commits on Jul 10, 2013

• Implemented category filter

  

  Jonathan Castillo

  committed
  2efed15

  Copy full SHA for 2efed15

• added restaurant_is_not_overbooked validation to Reservation model

  

  Jonathan Castillo

  committed
  fd92c89

  Copy full SHA for fd92c89

• Added user_has_not_reserved_validation to Reservation model

  

  Jonathan Castillo

  committed
  e929299

  Copy full SHA for e929299