Code

Finished Danebook#61

Code

Open

MariahAcacia wants to merge 98 commits intovikingeducation:mastervikingeducation/project_danebook:masterfrom MariahAcacia:masterMariahAcacia/project_danebook:masterCopy head branch name to clipboard

+44,192

Commits

Commits on Sep 23, 2014

• Create README.md

  eriktrautman

  committed
  a382cbd

  Copy full SHA for a382cbd

Commits on Jul 20, 2015

• Update README.md

  eriktrautman

  committed
  eef2540

  Copy full SHA for eef2540

Commits on Aug 29, 2017

• initial commit

  MariahAcacia

  committed
  55cbf90

  Copy full SHA for 55cbf90

• updated readme

  MariahAcacia

  committed
  fd2d614

  Copy full SHA for fd2d614

• updated readme

  MariahAcacia

  committed
  9308de2

  Copy full SHA for 9308de2

• added root to home, view and action

  MariahAcacia

  committed
  01a62ad

  Copy full SHA for 01a62ad

Commits on Aug 30, 2017

• finished timeline page and route

  MariahAcacia

  committed
  e828d6f

  Copy full SHA for e828d6f

• finished adding friends page and route

  MariahAcacia

  committed
  918f14e

  Copy full SHA for 918f14e

• added about page and route

  MariahAcacia

  committed
  289b7fb

  Copy full SHA for 289b7fb

• finished photo page and route

  MariahAcacia

  committed
  4452e30

  Copy full SHA for 4452e30

• fixed navbar for home(not logged in) vs. other pages(logged in)

  MariahAcacia

  committed
  aea32e6

  Copy full SHA for aea32e6

Commits on Aug 31, 2017

• added and finished about_edit page and route, link on about page works

  MariahAcacia

  committed
  0380dea

  Copy full SHA for 0380dea

• links work for all pages

  MariahAcacia

  committed
  ea87444

  Copy full SHA for ea87444

• fixed pages links so they are gray when on that page

  MariahAcacia

  committed
  390c06d

  Copy full SHA for 390c06d

• fixed a few little styling/spacing issues

  MariahAcacia

  committed
  02c0773

  Copy full SHA for 02c0773

• gave each page it's own css file

  MariahAcacia

  committed
  38bc6ad

  Copy full SHA for 38bc6ad

• broke timeline page into partials

  MariahAcacia

  committed
  3125c1f

  Copy full SHA for 3125c1f

• broke photos into partials

  MariahAcacia

  committed
  65bdc7b

  Copy full SHA for 65bdc7b

• broke friends page into partials

  MariahAcacia

  committed
  a0ed27a

  Copy full SHA for a0ed27a

• broke botha bout pages into partials

  MariahAcacia

  committed
  c2b4c76

  Copy full SHA for c2b4c76

• refactored stylesheets

  MariahAcacia

  committed
  cdec5f3

  Copy full SHA for cdec5f3

• added pg gem for production

  MariahAcacia

  committed
  211bc51

  Copy full SHA for 211bc51

Commits on Sep 1, 2017

• getting ready to deploy

  MariahAcacia

  committed
  e85ea76

  Copy full SHA for e85ea76

• gettingready to deploy

  MariahAcacia

  committed
  483b2e9

  Copy full SHA for 483b2e9

• added secrets.yml to gitignore

  MariahAcacia

  committed
  e7f2870

  Copy full SHA for e7f2870

• gitignore

  MariahAcacia

  committed
  8edaca7

  Copy full SHA for 8edaca7

• gitignore

  MariahAcacia

  committed
  df501e6

  Copy full SHA for df501e6

• changed db to pg

  MariahAcacia

  committed
  659ba64

  Copy full SHA for 659ba64

• fixed small display issue

  MariahAcacia

  committed
  8718e48

  Copy full SHA for 8718e48

• added deployed version to readme

  MariahAcacia

  committed
  e9b4579

  Copy full SHA for e9b4579

Commits on Sep 2, 2017

• fixed navbar issue

  MariahAcacia

  committed
  89d0822

  Copy full SHA for 89d0822

Commits on Apr 24, 2018

• merged repos

  MariahAcacia

  committed
  1b93765

  Copy full SHA for 1b93765

• added user model and beginnings of cookie auth

  MariahAcacia

  committed
  15aaf6a

  Copy full SHA for 15aaf6a

Commits on May 3, 2018

• login and new user function working

  MariahAcacia

  committed
  b14fa1c

  Copy full SHA for b14fa1c

Commits on May 9, 2018

• working on getting profile show and edit up and working

  MariahAcacia

  committed
  f802022

  Copy full SHA for f802022

Commits on May 11, 2018

• update profile functional

  MariahAcacia

  committed
  a3db7ed

  Copy full SHA for a3db7ed

• fixed spacing

  MariahAcacia

  committed
  c9f0946

  Copy full SHA for c9f0946

Commits on Jun 5, 2018

• like function working

  MariahAcacia

  committed
  8e8aca9

  Copy full SHA for 8e8aca9

Commits on Jun 12, 2018

• liking function working, seeded database

  MariahAcacia

  committed
  30585a8

  Copy full SHA for 30585a8

Commits on Aug 9, 2018

• added spec files finished feature tests for users

  MariahAcacia

  committed
  5943d83

  Copy full SHA for 5943d83

Commits on Aug 14, 2018

• finished controller spec for users

  MariahAcacia

  committed
  9a0f4ed

  Copy full SHA for 9a0f4ed

Commits on Aug 20, 2018

• finished request specs, except comments - need help on comments requests

  MariahAcacia

  committed
  7769085

  Copy full SHA for 7769085

Commits on Aug 21, 2018

• started post and comment index view specs, need to do like unlike links

  MariahAcacia

  committed
  0d2ef1a

  Copy full SHA for 0d2ef1a

Commits on Aug 22, 2018

• finished comments index spec, added like, unlike test to post index spec

  MariahAcacia

  committed
  b56ab34

  Copy full SHA for b56ab34

• added new deployed address

  MariahAcacia

  committed
  111138f

  Copy full SHA for 111138f

• trying to fix home, signup page layout

  MariahAcacia

  committed
  5a45b59

  Copy full SHA for 5a45b59

• fixed spacing issued on homepage

  MariahAcacia

  committed
  975f416

  Copy full SHA for 975f416

• fixed spacing issued on homepage

  MariahAcacia

  committed
  34d0688

  Copy full SHA for 34d0688

• fixed spacing issued on homepage

  MariahAcacia

  committed
  b55d65d

  Copy full SHA for b55d65d

Commits on Sep 13, 2018

• added friending functionality (one way no confirmation), added friend page and widget on timeline

  MariahAcacia

  committed
  2f00030

  Copy full SHA for 2f00030

Commits on Sep 14, 2018

• added photo mvc, changed comments to polymorphic to apply to photos as well as posts

  MariahAcacia

  committed
  6b07cc6

  Copy full SHA for 6b07cc6

• fixed comment form for posts to take commentable id and type instead of post_id

  MariahAcacia

  committed
  e6334ab

  Copy full SHA for e6334ab

• most of photo functionality working, still need widget and index layout

  MariahAcacia

  committed
  75372f6

  Copy full SHA for 75372f6

• almost finish with styling photo index page

  MariahAcacia

  committed
  4e0ddc9

  Copy full SHA for 4e0ddc9

Commits on Sep 15, 2018

• fixed spacing on photos page, fixed route and file structure slightly, started on photos widget on timeline

  MariahAcacia

  committed
  403b632

  Copy full SHA for 403b632

Commits on Sep 17, 2018

• timeline photos widget now working

  MariahAcacia

  committed
  f91c735

  Copy full SHA for f91c735

Commits on Sep 18, 2018

• Added coverphotoid and profilephotoid to profiles photos now on thumbnails"

  MariahAcacia

  committed
  c3b3044

  Copy full SHA for c3b3044

• fixed some styling on timeline

  MariahAcacia

  committed
  65117cd

  Copy full SHA for 65117cd

Commits on Sep 23, 2018

• fixed some specs

  MariahAcacia

  committed
  80c74d2

  Copy full SHA for 80c74d2

Commits on Sep 24, 2018

• finished fixing specs

  MariahAcacia

  committed
  f735d7f

  Copy full SHA for f735d7f

Commits on Sep 27, 2018

• added request and model tests for photos

  MariahAcacia

  committed
  f048423

  Copy full SHA for f048423

Commits on Oct 3, 2018

• fixed some spacing issues

  MariahAcacia

  committed
  2a3a7e3

  Copy full SHA for 2a3a7e3

Commits on Oct 25, 2018

• added user search function and wired up search in navbar

  MariahAcacia

  committed
  4cc825c

  Copy full SHA for 4cc825c

Commits on Oct 26, 2018

• added delayed jobs, delayed welcome email, added email for comments, added delay on comment email

  MariahAcacia

  committed
  6f46346

  Copy full SHA for 6f46346

Commits on Oct 27, 2018

• newsfeed post list done, left side recently active list not done

  MariahAcacia

  committed
  2b97b96

  Copy full SHA for 2b97b96

Commits on Oct 29, 2018

• finished recently active friend list for newsfeed, started on clean up and refactor

  MariahAcacia

  committed
  ea56b6a

  Copy full SHA for ea56b6a

Commits on Oct 31, 2018

• refectoring, fixing newfeed

  MariahAcacia

  committed
  cc1a8fe

  Copy full SHA for cc1a8fe

Commits on Nov 5, 2018

• finished newsfeed

  MariahAcacia

  committed
  cc35a35

  Copy full SHA for cc35a35

• fixed some spacing on newsfeed, refactored controllers

  MariahAcacia

  committed
  2a0f0d5

  Copy full SHA for 2a0f0d5

• refactored views

  MariahAcacia

  committed
  2e28ed3

  Copy full SHA for 2e28ed3

Commits on Nov 6, 2018

• more refactoring and fixed tests to reflect

  MariahAcacia

  committed
  7ddae65

  Copy full SHA for 7ddae65

• started to add comment request test coverage

  MariahAcacia

  committed
  1a962b8

  Copy full SHA for 1a962b8

Commits on Nov 7, 2018

• added address section to mailers, added comment request tests, delete not working for some reason

  MariahAcacia

  committed
  13eb3eb

  Copy full SHA for 13eb3eb

Commits on Nov 8, 2018

• finished adding comment request testing

  MariahAcacia

  committed
  12df6ca

  Copy full SHA for 12df6ca

Commits on Nov 9, 2018

• adding form error messages

  MariahAcacia

  committed
  d32b34a

  Copy full SHA for d32b34a

• fixed user request spec, controllers to build and edit profile through user

  MariahAcacia

  committed
  01dd84e

  Copy full SHA for 01dd84e

• added error messages to forms

  MariahAcacia

  committed
  67ac124

  Copy full SHA for 67ac124

Commits on Nov 10, 2018

• fixed some styling and spacing issues

  MariahAcacia

  committed
  4013cbc

  Copy full SHA for 4013cbc

Commits on Nov 17, 2018

• added delete account and unsubscribe from email option, still need to style a bit and work on unsubscribe links in emails

  MariahAcacia

  committed
  b456269

  Copy full SHA for b456269

Commits on Nov 26, 2018

• fixed like association so it is destroyed when user is, fixed a little styling and updated tests to include destroy actions

  MariahAcacia

  committed
  dc7847c

  Copy full SHA for dc7847c

• added profile for heroku

  MariahAcacia

  committed
  934065c

  Copy full SHA for 934065c

• fixed link url in mailers

  MariahAcacia

  committed
  81fc2a4

  Copy full SHA for 81fc2a4

• Delete secrets.yml

  MariahAcacia

  authored
  d808fc0

  Copy full SHA for d808fc0

Commits on Nov 27, 2018

• Create secrets.yml

  MariahAcacia

  authored
  aedbc56

  Copy full SHA for aedbc56

• Delete secrets.yml

  MariahAcacia

  authored
  401fc2d

  Copy full SHA for 401fc2d

• Create secrets.yml

  MariahAcacia

  authored
  70c47ed

  Copy full SHA for 70c47ed

• hopefully fixed merge issue

  MariahAcacia

  committed
  c023fd0

  Copy full SHA for c023fd0

• Merge branch 'master' of https://github.com/MariahAcacia/project_danebook

  Show description for d0be363
  MariahAcacia

  committed
  d0be363

  Copy full SHA for d0be363

• fixed merge issue

  MariahAcacia

  committed
  6670335

  Copy full SHA for 6670335

• removed merge

  MariahAcacia

  committed
  44b0b4a

  Copy full SHA for 44b0b4a

Commits on Nov 28, 2018

• fixed issue when you delete photo if it was set as profile or cover photo

  MariahAcacia

  committed
  8c3d65f

  Copy full SHA for 8c3d65f

Commits on Dec 4, 2018

• fixed some styles, bugs, and refactor

  MariahAcacia

  committed
  f944d5f

  Copy full SHA for f944d5f

Commits on Dec 6, 2018

• added default host to all env

  MariahAcacia

  committed
  dd2d05f

  Copy full SHA for dd2d05f

Commits on Dec 7, 2018

• added url for deployed version

  MariahAcacia

  committed
  a7356d1

  Copy full SHA for a7356d1

• updated readme

  MariahAcacia

  committed
  8c9c1fb

  Copy full SHA for 8c9c1fb

• refactored a bit"

  MariahAcacia

  committed
  b4da019

  Copy full SHA for b4da019

Commits on Dec 10, 2018

• got rid of whitespace above navbar

  MariahAcacia

  committed
  bcf83ee

  Copy full SHA for bcf83ee

• compiled assets to deploy

  MariahAcacia

  committed
  f14fa31

  Copy full SHA for f14fa31