Code

Update proposal.md#1

Code

Open

pdnagraj wants to merge 145 commits intoumass-cs-326:masterumass-cs-326/326_project:masterfrom jhui04:masterjhui04/326_project:masterCopy head branch name to clipboard

+2,728-27

Commits

Commits on Sep 20, 2018

• Update proposal.md

  

  Justin Hui

  authored
  4fb7a02

• Homepage

  Show description for 874702f
  

  Parth Arya

  committed
  874702f

Commits on Sep 21, 2018

• Update proposal.md

  

  Justin Hui

  authored
  c781ca5

• Navigation bar

  Show description for 2ba2bf6
  

  Parth Arya

  committed
  2ba2bf6

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  Parth Arya

  committed
  c62bdd1

Commits on Sep 22, 2018

• Event Page

  erica-z

  authored
  8d9dc69

Commits on Sep 23, 2018

• HomePage fix

  Show description for f1ec8af
  

  Parth Arya

  committed
  f1ec8af

Commits on Sep 25, 2018

• Done

  Show description for 76d128c
  

  Parth Arya

  committed
  76d128c

Commits on Sep 27, 2018

• Update proposal.md

  

  baileyboone

  authored
  057d173

• added map page

  

  jhui04

  committed
  a1d69ff

• Added index.html

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  16b8c1d

• Deleted #index.html#

  Show description for 2c6011c
  

  baileyboone

  authored
  2c6011c

• Deleted index.html~

  Show description for b276114
  

  baileyboone

  authored
  b276114

• Added brief explanation at top of tile.

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  1e05005

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  4e13abf

• Updated backgrounds to fit main page.

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  41bcc58

• Made an About page

  Show description for da823ac
  

  Parth Arya

  committed
  da823ac

• Update proposal.md

  

  Justin Hui

  authored
  e59e0cb

• Add files via upload

  

  Justin Hui

  authored
  f1c58ca

• Added mock data to home, event, and about pages, and created the profile page

  

  jhui04

  committed
  04784e2

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  jhui04

  committed
  916be4b

• Comitted

  

  Parth Arya

  committed
  d679bdd

Commits on Sep 28, 2018

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  Parth Arya

  committed
  925deb4

• added django template

  

  jhui04

  committed
  7bcee66

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  jhui04

  committed
  f50b98a

Commits on Oct 2, 2018

• added urls.py for Catch app with redirects

  

  jhui04

  committed
  58366ea

• Changed the homePage

  

  Parth Arya

  committed
  a3bc116

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  Parth Arya

  committed
  b25cdcb

Commits on Oct 4, 2018

• removed icon header

  

  vagrant

  committed
  c3603e3

Commits on Oct 6, 2018

• superuser created

  

  jhui04

  committed
  b5c0b6b

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  jhui04

  committed
  3557266

Commits on Oct 8, 2018

• Added simple event model and url mapping for navbar

  

  jhui04

  committed
  dd58747

• Made a forumpage, homepage editing now

  

  Parth Arya

  committed
  64f00c6

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  Parth Arya

  committed
  35b7dde

• registered Event model in admin.py

  

  jhui04

  committed
  ac51d33

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  jhui04

  committed
  51b1140

• Adding events function

  

  Parth Arya

  committed
  441505e

• submission page working, needs to redirect afterwards

  

  jhui04

  committed
  68a5988

Commits on Oct 16, 2018

• Create proposal.md

  

  Justin Hui

  authored
  0dba388

• Create imgs

  

  Justin Hui

  authored
  89b9728

• Add files via upload

  

  Justin Hui

  authored
  07ebbb1

• reuploaded the deleted imgs folder

  

  jhui04

  committed
  6d22e5b

Commits on Oct 17, 2018

• home page edit on aquiring events

  

  Parth Arya

  committed
  c5930a0

Commits on Oct 18, 2018

• added pet model and submission form

  

  jhui04

  committed
  8943608

• fixed submit button redirect.

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  6879f4c

Commits on Oct 20, 2018

• Project2DataModel

  erica-z

  authored
  b4d75e3

Commits on Oct 25, 2018

• qweqwe

  erica-z

  committed
  5a8b240

• pet model

  erica-z

  committed
  53b2028

• init.sh

  erica-z

  committed
  b1cc3e9

• updated models.py

  erica-z

  committed
  6af6bc3

• updated models.py

  erica-z

  committed
  b09ba7b

• updated models.py

  erica-z

  committed
  bc7e603

Commits on Oct 26, 2018

• added templates and faker for petuser

  

  jhui04

  committed
  59de7fc

• finished most of init.py, just needs cleaning up

  

  jhui04

  committed
  b8e81cf

Commits on Oct 27, 2018

• Putting back forms i deleted!!

  erica-z

  committed
  8b1bc4b

• Putting back style.css

  erica-z

  committed
  e3b0d7c

• Revert "Putting back style.css"

  Show description for 63bf056
  erica-z

  committed
  63bf056

Commits on Oct 28, 2018

• cleaned up CSS and init.py

  

  vagrant

  committed
  d5b2d4a

• Merge branch 'master' of https://github.com/jhui04/326_project

  erica-z

  committed
  279d79f

• Revert "Merge branch 'master' of https://github.com/jhui04/326_project"

  Show description for 9facf27
  erica-z

  committed
  9facf27

• edited init.sh and updated the data model diagram

  erica-z

  committed
  8ac102e

Commits on Oct 30, 2018

• updated data model diagram

  erica-z

  committed
  998d90b

• created images[]

  erica-z

  committed
  47f968f

• deleted unnecessary imports

  erica-z

  committed
  9340dcf

• images for mock data

  erica-z

  committed
  d19ecf6

Commits on Oct 31, 2018

• images weren't showing up, added images to generation and templating

  

  jhui04

  committed
  b79e058

Commits on Nov 1, 2018

• readded the event and pet form

  

  jhui04

  committed
  eecfcfb

Commits on Nov 2, 2018

• individual write up

  erica-z

  committed
  bfa4575

Commits on Nov 3, 2018

• updated diagram

  erica-z

  committed
  8cc25b0

Commits on Nov 5, 2018

• Added indivisual writeup / team writeup

  

  Parth Arya

  committed
  9689f9c

Commits on Nov 6, 2018

• indiv. write up - added link to git hub

  erica-z

  committed
  38a8c7f

• Merge branch 'master' of https://github.com/jhui04/326_project

  erica-z

  committed
  afb4d7f

• Create submission_02.md

  

  Justin Hui

  authored
  3ed2dd6

• Add files via upload

  

  Justin Hui

  authored
  f219570

• Update submission_02.md

  

  Justin Hui

  authored
  966769d

• Update submission_02.md

  

  Justin Hui

  authored
  d4e0aa8

• Update submission_02.md

  

  Justin Hui

  authored
  0e230d7

• changed string representations of PetUser and Pet

  

  jhui04

  committed
  654403b

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  jhui04

  committed
  89c7a88

• Create Justin_Hui_submission_02.md

  

  Justin Hui

  authored
  8eabdf2

• Parth-Nagraj-Indivisual-Write-Up

  Show description for 94dbd26
  pdnagraj

  authored
  94dbd26

• Rename Parth-Nagraj-Individual-Writeup to Parth-Nagraj-Individual-Writeup.md

  pdnagraj

  authored
  ee66327

• Delete Parth Nagraj - Indivisual Write-Up.docx

  pdnagraj

  authored
  c5e987b

• Added individual submission writeup.

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  f172c18

Commits on Nov 13, 2018

• login.html --directly from lecture slides

  erica-z

  committed
  e6d24ea

• added path to login.html and moved into Catch directory

  

  jhui04

  committed
  905ed96

Commits on Nov 19, 2018

• added nav bar and style in the login.html

  erica-z

  committed
  ff32a77

• added log in redirect in settings

  Show description for d68fdf9
  erica-z

  committed
  d68fdf9

• added form to change email

  Show description for 8e5ee98
  erica-z

  committed
  8e5ee98

• Added comments about where the problem could be

  erica-z

  committed
  85c0c59

Commits on Nov 22, 2018

• added user sign up form and added a sign up button in homepage

  erica-z

  committed
  e491584

• extended django's user model to our PetUser; created 4 buttons on homepage to support user signup, login, view profile, and edit profile

  Show description for b6416bc
  erica-z

  committed
  b6416bc

• adjusted display of homepage buttons depending on if the user's logged in

  erica-z

  committed
  dab34ec

Commits on Nov 26, 2018

• login/logout and authentication required to view navbar

  

  jhui04

  committed
  5240ecc

Commits on Nov 27, 2018

• profile, pets, and events are displayed based on logged in user, changed aboutPage to petPage

  

  jhui04

  committed
  3e79d95

• edit homepage, events, and profile to display different data depending on if the user is logged in

  erica-z

  committed
  c2bafbb

• added groups and permissions, all users generated from init.py are in it

  

  jhui04

  committed
  0af01d9

• Create submission_03.md

  

  Justin Hui

  authored
  5a04f13

• Update submission_03.md

  

  Justin Hui

  authored
  353a3ac

• Create Justin_Hui_submission_03.md

  

  Justin Hui

  authored
  c68fe54

• Update Justin_Hui_submission_03.md

  

  Justin Hui

  authored
  79decec

• Revert "edit homepage, events, and profile to display different data depending on if the user is logged in"

  Show description for c54860f
  erica-z

  committed
  c54860f

• Merge branch 'master' of https://github.com/jhui04/326_project

  erica-z

  committed
  ab6e8c1

• edited navbar.html so users that are not logged in can see the website and edited profile page to check if image exists

  erica-z

  committed
  fdbb044

• implemented add pet

  erica-z

  committed
  2d6bbb6

• Update submission_03.md

  

  Justin Hui

  authored
  27849d4

• Update submission_03.md

  

  Justin Hui

  authored
  f4f4869

• individual write up project 3

  erica-z

  committed
  3086538

• Merge branch 'master' of https://github.com/jhui04/326_project

  erica-z

  committed
  beca2b6

• Cleaned up the docs, Added sumbision video, added my indivisual submission

  

  Parth Arya

  committed
  06a7a36

• Personal submission.

  

  Bailey Boone

  authored and

  Bailey Boone

  committed
  819f1de

Commits on Dec 10, 2018

• update to navbar.html so that events/pets tab are clickable when user isn't logged in

  erica-z

  committed
  762d1a8

Commits on Dec 11, 2018

• added markers for each event that display information when clicked. events now generate in the amherst area and map centers on user's location

  

  jhui04

  committed
  e56d301

• updated events page to display all events in the database

  erica-z

  committed
  5daa371

• added "add pet" button to pets page

  erica-z

  committed
  55b2853

• homePage displays the events the user is hosting

  

  jhui04

  committed
  554f410

• homePage displays the events the user is hosting

  

  jhui04

  committed
  2144d60

• added pets have randomly chosen stock images

  

  jhui04

  committed
  f7cafb7

• cleaned urls

  erica-z

  committed
  4846708

• Revert "cleaned urls"

  Show description for 136af6b
  erica-z

  committed
  136af6b

• Merge branch 'master' of https://github.com/jhui04/326_project

  erica-z

  committed
  86e8c02

• Revert "Merge branch 'master' of https://github.com/jhui04/326_project"

  Show description for c3ca51d
  erica-z

  committed
  c3ca51d

• Button fix.

  Show description for 9954c34
  baileyboone

  committed
  9954c34

• reverting some changes to f7cafb7

  

  jhui04

  committed
  e692eda

• Update .DS_Store

  erica-z

  committed
  24bdbd0

• AnonymousUser PetPage fix

  Show description for a353346
  baileyboone

  committed
  a353346

Commits on Dec 12, 2018

• Revert "reverting some changes to f7cafb7"

  Show description for b06d064
  baileyboone

  committed
  b06d064

• reverted the revert from before and fixed the navbar when logged out again.

  baileyboone

  committed
  2bb916f

• removed loginrequiredmixin

  Show description for f049f08
  baileyboone

  committed
  f049f08

• no more sign ups

  Show description for ff434f0
  baileyboone

  committed
  ff434f0

• add events on eventpage

  Show description for 9d6cb06
  baileyboone

  committed
  9d6cb06

• added final write up and the slides

  erica-z

  authored
  5f539cd

• deleted some tables, added back maps

  

  jhui04

  committed
  f8816dd

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  jhui04

  committed
  b1e459b

• style tweaks

  Show description for f05a4fd
  baileyboone

  committed
  f05a4fd

• Merge branch 'master' of https://github.com/jhui04/326_project

  baileyboone

  committed
  e539fbf

• more style update

  Show description for 7a23921
  baileyboone

  committed
  7a23921

• navbar opacity

  Show description for 618222f
  baileyboone

  committed
  618222f

• Added Final writeup and made it md

  

  Parth Arya

  authored and

  Parth Arya

  committed
  67f4c4b

• Final_Write_Up

  Show description for 7bf67f3
  pdnagraj

  authored
  7bf67f3

• Delete Final_Write_Up

  pdnagraj

  authored
  57e5ced

• Final Write Up

  pdnagraj

  authored
  3018d50

• Delete final_write_up.md

  pdnagraj

  authored
  0245c43

• Presentation Update

  

  Parth Arya

  authored and

  Parth Arya

  committed
  a36d5ff

• Merge branch 'master' of https://github.com/jhui04/326_project

  

  Parth Arya

  authored and

  Parth Arya

  committed
  ae78a75