Code

Alan D6 kind of finished#4

Code

Open

AlanCoding wants to merge 52 commits intotiyd-python-2015-05:mastertiyd-python-2015-05/django-movies:masterfrom AlanCoding:masterAlanCoding/django-movies:masterCopy head branch name to clipboard

+70,898-30

Commits

Commits on Jun 14, 2015

• initial commit

  AlanCoding

  committed
  3cd5198

  Copy full SHA for 3cd5198

• initial commit

  AlanCoding

  committed
  9275155

  Copy full SHA for 9275155

• added procfile

  AlanCoding

  committed
  051e19c

  Copy full SHA for 051e19c

• added procfile

  AlanCoding

  committed
  9440ff7

  Copy full SHA for 9440ff7

Commits on Jun 15, 2015

• added runtime.txt

  AlanCoding

  committed
  4842cab

  Copy full SHA for 4842cab

• added runtime.txt

  AlanCoding

  committed
  8cbc1f9

  Copy full SHA for 8cbc1f9

• changed Procfile to point to movies

  AlanCoding

  committed
  15725cb

  Copy full SHA for 15725cb

• changed Procfile to point to movies

  AlanCoding

  committed
  83a8e6b

  Copy full SHA for 83a8e6b

• production fixes

  AlanCoding

  committed
  094f3bd

  Copy full SHA for 094f3bd

• production fixes

  AlanCoding

  committed
  2545d37

  Copy full SHA for 2545d37

• at last get rid of the darn top 20 list

  AlanCoding

  committed
  290516b

  Copy full SHA for 290516b

• at last get rid of the darn top 20 list

  AlanCoding

  committed
  76d46ab

  Copy full SHA for 76d46ab

• nuke repo with production version

  AlanCoding

  committed
  6e566f9

  Copy full SHA for 6e566f9

• nuke repo with production version

  AlanCoding

  committed
  69faca5

  Copy full SHA for 69faca5

• DB file removed at long last

  AlanCoding

  committed
  9d98b03

  Copy full SHA for 9d98b03

• DB file removed at long last

  AlanCoding

  committed
  06d4876

  Copy full SHA for 06d4876

• middle of big db changes

  AlanCoding

  committed
  6a1eb70

  Copy full SHA for 6a1eb70

• middle of big db changes

  AlanCoding

  committed
  865f938

  Copy full SHA for 865f938

• get json files on gitignore

  AlanCoding

  committed
  a6851c6

  Copy full SHA for a6851c6

Commits on Jun 16, 2015

• most functionality requirements

  AlanCoding

  committed
  d729593

  Copy full SHA for d729593

• removed json files properly

  AlanCoding

  committed
  0f6af59

  Copy full SHA for 0f6af59

• fixed conflict after history change because of big file oops

  AlanCoding

  committed
  5e25181

  Copy full SHA for 5e25181

• edit review works

  AlanCoding

  committed
  afe5e2e

  Copy full SHA for afe5e2e

• user dashboard working except for delete review

  AlanCoding

  committed
  2d6286a

  Copy full SHA for 2d6286a

• delete rating works

  AlanCoding

  committed
  f9ff893

  Copy full SHA for f9ff893

• loading bootstraps

  AlanCoding

  committed
  e314d61

  Copy full SHA for e314d61

• bootstraps basic functionality

  AlanCoding

  committed
  af4c264

  Copy full SHA for af4c264

• get rid of virtual env files

  AlanCoding

  committed
  15ace8a

  Copy full SHA for 15ace8a

• remove more junk files from repo

  AlanCoding

  committed
  55ab0d0

  Copy full SHA for 55ab0d0

• lots of asthetic improvements

  AlanCoding

  committed
  e433e5c

  Copy full SHA for e433e5c

Commits on Jun 17, 2015

• working using progreSQL DB

  AlanCoding

  committed
  9837372

  Copy full SHA for 9837372

• replaced all lists with bootstrap tables

  AlanCoding

  committed
  1ca6691

  Copy full SHA for 1ca6691

• commit progress bar before merge attempt

  AlanCoding

  committed
  0ca3822

  Copy full SHA for 0ca3822

• more before merge

  AlanCoding

  committed
  000c110

  Copy full SHA for 000c110

• merge should be complete

  AlanCoding

  committed
  335aaf3

  Copy full SHA for 335aaf3

• prepare files for 2nd try

  AlanCoding

  committed
  8c87527

  Copy full SHA for 8c87527

• merge, hopefully done right this time

  AlanCoding

  committed
  eeb1757

  Copy full SHA for eeb1757

• 404 file work, production mode

  AlanCoding

  committed
  83e0696

  Copy full SHA for 83e0696

• added movie rating over time plots

  AlanCoding

  committed
  0038347

  Copy full SHA for 0038347

• caching for top 20 working, start of class views

  AlanCoding

  committed
  650d1b8

  Copy full SHA for 650d1b8

• top 20 paginated version working well

  AlanCoding

  committed
  a0208c8

  Copy full SHA for a0208c8

Commits on Jun 18, 2015

• hard won victory - figured out pagination for genre

  AlanCoding

  committed
  522be35

  Copy full SHA for 522be35

• user page paginated

  AlanCoding

  committed
  57c2fc1

  Copy full SHA for 57c2fc1

• last changes specific to class

  AlanCoding

  committed
  8fcf618

  Copy full SHA for 8fcf618

• static files needed for heroku

  AlanCoding

  committed
  969d571

  Copy full SHA for 969d571

• include more static directories

  AlanCoding

  committed
  acb24a3

  Copy full SHA for acb24a3

• small additions

  AlanCoding

  committed
  4d443f7

  Copy full SHA for 4d443f7

• settings for hiroku and foreman together

  AlanCoding

  committed
  0a9fa9d

  Copy full SHA for 0a9fa9d

• hard code heroku db

  AlanCoding

  committed
  f00f68f

  Copy full SHA for f00f68f

• databases dictionary error

  AlanCoding

  committed
  9425c86

  Copy full SHA for 9425c86

• extreme duplication of static directories

  AlanCoding

  committed
  ede69f4

  Copy full SHA for ede69f4

Commits on Jun 22, 2015

• collect changes from heroku for github

  AlanCoding

  committed
  e6b3de9

  Copy full SHA for e6b3de9