Code

Project 3, Perry, Claire, Will, Chris#16

Code

Open

chris-shum wants to merge 79 commits intoga-adi:masterga-adi/Project-3:masterfrom chris-shum:masterchris-shum/GA-Project3:masterCopy head branch name to clipboard

+9,206-2

Commits

Commits on Mar 7, 2016

• Initial Commit

  

  chris-shum

  committed
  784fe9d

  Copy full SHA for 784fe9d

• Functional Toolbar in Portrait Mode

  

  chris-shum

  committed
  35bc68d

  Copy full SHA for 35bc68d

Commits on Mar 8, 2016

• Pretty colors

  

  chris-shum

  committed
  2ca1d0c

  Copy full SHA for 2ca1d0c

• Passing to Perry

  

  chris-shum

  committed
  903c6d7

  Copy full SHA for 903c6d7

• built recycler view inside fragment 1 Perry and Chris. Added different card_view layouts

  

  pcooperman28

  committed
  9c38299

  Copy full SHA for 9c38299

• Add gitignore

  

  chris-shum

  committed
  319d2ac

  Copy full SHA for 319d2ac

• Tweak

  

  chris-shum

  committed
  d1fb400

  Copy full SHA for d1fb400

• Finish things

  

  chris-shum

  committed
  0bebe71

  Copy full SHA for 0bebe71

Commits on Mar 9, 2016

• Pass code

  

  chris-shum

  committed
  208d363

  Copy full SHA for 208d363

• 2 cards working

  

  chris-shum

  committed
  c37d002

  Copy full SHA for c37d002

• Added sample reddit view and Selection Page View

  

  pcooperman28

  committed
  aaf043b

  Copy full SHA for aaf043b

• Merge branch 'master' of https://github.com/chris-shum/Project-3

  

  pcooperman28

  committed
  09bbd0a

  Copy full SHA for 09bbd0a

• Facebook

  incepted

  committed
  096f231

  Copy full SHA for 096f231

• Narrowing down data featuers

  

  chris-shum

  committed
  6ee29b6

  Copy full SHA for 6ee29b6

• added some layout adjustements

  

  pcooperman28

  committed
  44bc58b

  Copy full SHA for 44bc58b

• Merge branch 'master' of https://github.com/chris-shum/Project-3

  

  pcooperman28

  committed
  db336d7

  Copy full SHA for db336d7

• resolved merge conflicts

  

  pcooperman28

  committed
  12fcc26

  Copy full SHA for 12fcc26

Commits on Mar 10, 2016

• Weather API call implemented

  WasabiMayo

  committed
  8359005

  Copy full SHA for 8359005

• Reddit Api

  WasabiMayo

  committed
  dac83e8

  Copy full SHA for dac83e8

• Merge pull request #1 from chris-shum/branch-claire

  Show description for ee025f9
  

  Chris Shum

  committed
  ee025f9

  Copy full SHA for ee025f9

• Added Singleton

  

  chris-shum

  committed
  4366786

  Copy full SHA for 4366786

• Resolved merge conflicts

  

  chris-shum

  committed
  37eded9

  Copy full SHA for 37eded9

• Merge?

  

  chris-shum

  committed
  d64990a

  Copy full SHA for d64990a

• some card XML design additions

  

  pcooperman28

  committed
  3fbccc9

  Copy full SHA for 3fbccc9

• Merge branch 'perrys_branch'

  

  pcooperman28

  committed
  72f3666

  Copy full SHA for 72f3666

• weather card class created and built at end of API call in the MainActivity. TODO build weatherholder in CardAdapter and add weathercard to singleton and create singleton methods getsize, get id, g…

  Show description for 2c5afa9
  

  pcooperman28

  committed
  2c5afa9

  Copy full SHA for 2c5afa9

• Reddit API is done

  WasabiMayo

  committed
  d85d5c0

  Copy full SHA for d85d5c0

• Merge pull request #2 from chris-shum/branch-claire

  Show description for 4fe6758
  WasabiMayo

  committed
  4fe6758

  Copy full SHA for 4fe6758

• Added holder for weather and weather card. Adjusted some of the layout files to appear more card-y. adjusted the format of the card objects so they will have an ID and a TAB extended from the Paren…

  Show description for fb9a8d6
  

  pcooperman28

  committed
  fb9a8d6

  Copy full SHA for fb9a8d6

• Merge branch 'master' of https://github.com/chris-shum/Project-3

  

  pcooperman28

  committed
  bdd1ade

  Copy full SHA for bdd1ade

• commit?

  

  pcooperman28

  committed
  18aa347

  Copy full SHA for 18aa347

• Refresh

  WasabiMayo

  committed
  22e94f2

  Copy full SHA for 22e94f2

• Merge branch 'master' of https://github.com/chris-shum/Project-3 into branch-claire

  WasabiMayo

  committed
  14ed006

  Copy full SHA for 14ed006

• Merge conflict solved

  WasabiMayo

  committed
  d703d2c

  Copy full SHA for d703d2c

• Foursquare

  WasabiMayo

  committed
  aae0f56

  Copy full SHA for aae0f56

• Merge pull request #4 from chris-shum/branch-claire

  Show description for 1a08301
  WasabiMayo

  committed
  1a08301

  Copy full SHA for 1a08301

• Perry Added Singleton Logic for 11 individual arrays

  

  pcooperman28

  committed
  808eecc

  Copy full SHA for 808eecc

• solved merge conflicts

  

  pcooperman28

  committed
  027719c

  Copy full SHA for 027719c

• All tabs added

  

  chris-shum

  committed
  3253e43

  Copy full SHA for 3253e43

• Resolved merge conflicts

  

  chris-shum

  committed
  43621b4

  Copy full SHA for 43621b4

• Most up to date code

  

  chris-shum

  committed
  87689f5

  Copy full SHA for 87689f5

• Added notes and possibly other things

  

  pcooperman28

  committed
  db8d1f9

  Copy full SHA for db8d1f9

• added redditSwitcher and meetupSwitcher in Main Activity and Facebook Card XML

  

  pcooperman28

  committed
  d0d7a7e

  Copy full SHA for d0d7a7e

• All tabs set

  

  chris-shum

  committed
  16a9f3e

  Copy full SHA for 16a9f3e

• Merge branch 'fourthBranch'

  

  chris-shum

  committed
  5c4feb8

  Copy full SHA for 5c4feb8

• Update

  WasabiMayo

  committed
  83a48a0

  Copy full SHA for 83a48a0

• FB implementation

  incepted

  committed
  a021cad

  Copy full SHA for a021cad

Commits on Mar 11, 2016

• Merge

  WasabiMayo

  committed
  cead69c

  Copy full SHA for cead69c

• Refresh

  WasabiMayo

  committed
  3478d4e

  Copy full SHA for 3478d4e

• FB

  incepted

  committed
  0d1fe1d

  Copy full SHA for 0d1fe1d

• refresh

  incepted

  committed
  46b3136

  Copy full SHA for 46b3136

• Clean

  incepted

  committed
  620c0db

  Copy full SHA for 620c0db

• Getting clean copy

  

  chris-shum

  committed
  384bc81

  Copy full SHA for 384bc81

• Something

  

  chris-shum

  committed
  6690df1

  Copy full SHA for 6690df1

• Trying to add selections page

  

  chris-shum

  committed
  521ff13

  Copy full SHA for 521ff13

• Selections Page

  

  chris-shum

  committed
  c75d919

  Copy full SHA for c75d919

• Files added

  

  chris-shum

  committed
  9dc0c1d

  Copy full SHA for 9dc0c1d

• Merge branch 'fifthBranch'

  

  chris-shum

  committed
  471020b

  Copy full SHA for 471020b

• Merge branch 'master' into fifthBranch

  

  chris-shum

  committed
  e787f61

  Copy full SHA for e787f61

• Final commit for the evening

  

  chris-shum

  committed
  a3fd954

  Copy full SHA for a3fd954

• Fragments updated, notifcation added, and menubar option

  

  chris-shum

  committed
  ef215a0

  Copy full SHA for ef215a0

• Created more cards and objects. API Call completed.

  WasabiMayo

  committed
  fae2c70

  Copy full SHA for fae2c70

• Refresh

  WasabiMayo

  committed
  dfff2b1

  Copy full SHA for dfff2b1

• Merge branch 'master' of https://github.com/chris-shum/Project-3

  WasabiMayo

  committed
  89f9b87

  Copy full SHA for 89f9b87

• Refresh

  WasabiMayo

  committed
  687888c

  Copy full SHA for 687888c

• Updated files: added User Test cases, Readme.md

  incepted

  committed
  a06822d

  Copy full SHA for a06822d

• added holders for both fourswuare and reddit. added new reddit layout. Going to attempt detail fragment

  

  pcooperman28

  committed
  7d83d9a

  Copy full SHA for 7d83d9a

• fixed merge conflicts

  

  pcooperman28

  committed
  8675ea7

  Copy full SHA for 8675ea7

• FacebookFeed is done

  WasabiMayo

  committed
  30d321b

  Copy full SHA for 30d321b

• Merge branch 'master' of https://github.com/chris-shum/Project-3

  incepted

  committed
  8cbcdd8

  Copy full SHA for 8cbcdd8

• Merge solved

  WasabiMayo

  committed
  d8b2c26

  Copy full SHA for d8b2c26

• Merge branch 'master' of https://github.com/chris-shum/Project-3

  WasabiMayo

  committed
  cfa1533

  Copy full SHA for cfa1533

• Working

  WasabiMayo

  committed
  de23af2

  Copy full SHA for de23af2

• Working code

  WasabiMayo

  committed
  8fe56c8

  Copy full SHA for 8fe56c8

• Really final

  WasabiMayo

  committed
  49849c2

  Copy full SHA for 49849c2

Commits on Mar 16, 2016

• Added files via upload

  

  Chris Shum

  committed
  0038ab4

  Copy full SHA for 0038ab4

Commits on Jul 23, 2016

• Update README.md

  chris-shum

  authored
  2adf068

  Copy full SHA for 2adf068

• Update strings.xml

  chris-shum

  authored
  013c0ac

  Copy full SHA for 013c0ac

• Update MainActivity.java

  chris-shum

  authored
  1e052ab

  Copy full SHA for 1e052ab