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

Open

chris-shum wants to merge 79 commits intoga-adi:masterfrom

chris-shum:master

Commits on Mar 7, 2016

Initial Commit
chris-shum
committed
Functional Toolbar in Portrait Mode
chris-shum
committed

Commits on Mar 8, 2016

Pretty colors
chris-shum
committed
Passing to Perry
chris-shum
committed
built recycler view inside fragment 1 Perry and Chris. Added different card_view layouts
pcooperman28
committed
Add gitignore
chris-shum
committed
Tweak
chris-shum
committed
Finish things
chris-shum
committed

Commits on Mar 9, 2016

Pass code
chris-shum
committed
2 cards working
chris-shum
committed
Added sample reddit view and Selection Page View
pcooperman28
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3
pcooperman28
committed
Facebook
incepted
committed
Narrowing down data featuers
chris-shum
committed
added some layout adjustements
pcooperman28
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3
pcooperman28
committed
resolved merge conflicts
pcooperman28
committed

Commits on Mar 10, 2016

Weather API call implemented
WasabiMayo
committed
Reddit Api
WasabiMayo
committed
Merge pull request #1 from chris-shum/branch-claire
Chris Shum
committed
Added Singleton
chris-shum
committed
Resolved merge conflicts
chris-shum
committed
Merge?
chris-shum
committed
some card XML design additions
pcooperman28
committed
Merge branch 'perrys_branch'
pcooperman28
committed
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, …
pcooperman28
committed
Reddit API is done
WasabiMayo
committed
Merge pull request #2 from chris-shum/branch-claire
WasabiMayo
committed
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 Par…
pcooperman28
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3
pcooperman28
committed
commit?
pcooperman28
committed
Refresh
WasabiMayo
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3 into branch-claire
WasabiMayo
committed
Merge conflict solved
WasabiMayo
committed
Foursquare
WasabiMayo
committed
Merge pull request #4 from chris-shum/branch-claire
WasabiMayo
committed
Perry Added Singleton Logic for 11 individual arrays
pcooperman28
committed
solved merge conflicts
pcooperman28
committed
All tabs added
chris-shum
committed
Resolved merge conflicts
chris-shum
committed
Most up to date code
chris-shum
committed
Added notes and possibly other things
pcooperman28
committed
added redditSwitcher and meetupSwitcher in Main Activity and Facebook Card XML
pcooperman28
committed
All tabs set
chris-shum
committed
Merge branch 'fourthBranch'
chris-shum
committed
Update
WasabiMayo
committed
FB implementation
incepted
committed

Commits on Mar 11, 2016

Merge
WasabiMayo
committed
Refresh
WasabiMayo
committed
FB
incepted
committed
refresh
incepted
committed
Clean
incepted
committed
Getting clean copy
chris-shum
committed
Something
chris-shum
committed
Trying to add selections page
chris-shum
committed
Selections Page
chris-shum
committed
Files added
chris-shum
committed
Merge branch 'fifthBranch'
chris-shum
committed
Merge branch 'master' into fifthBranch
chris-shum
committed
Final commit for the evening
chris-shum
committed
Fragments updated, notifcation added, and menubar option
chris-shum
committed
Created more cards and objects. API Call completed.
WasabiMayo
committed
Refresh
WasabiMayo
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3
WasabiMayo
committed
Refresh
WasabiMayo
committed
Updated files: added User Test cases, Readme.md
incepted
committed
added holders for both fourswuare and reddit. added new reddit layout. Going to attempt detail fragment
pcooperman28
committed
fixed merge conflicts
pcooperman28
committed
FacebookFeed is done
WasabiMayo
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3
incepted
committed
Merge solved
WasabiMayo
committed
Merge branch 'master' of https://github.com/chris-shum/Project-3
WasabiMayo
committed
Working
WasabiMayo
committed
Working code
WasabiMayo
committed
Really final
WasabiMayo
committed

Commits on Mar 16, 2016

Added files via upload
Chris Shum
committed

Commits on Jul 23, 2016