Skip to content

Shena_Brian_Jamaal_Pull_Request #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jamaal51 wants to merge 111 commits into
base: master
Choose a base branch
from
Open

Shena_Brian_Jamaal_Pull_Request #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
6390081
added pods, facebook SDK
Oct 9, 2015
a831ba4
added parse tested, working
Oct 10, 2015
d158861
setup Parse & added RESTKit
Oct 10, 2015
5f6cba3
Merge pull request #1 from bblanco1/master
Jamaal51 Oct 10, 2015
3079de7
test message
sheyoshida Oct 10, 2015
2cd75e8
collection view set up
sheyoshida Oct 10, 2015
5e1bf81
segue added
sheyoshida Oct 10, 2015
aa1cf2a
Updated Storyboard -JS
Oct 10, 2015
0b06d39
added more storyboards
Oct 10, 2015
222fc21
fixed collection view constraints
sheyoshida Oct 10, 2015
21a096e
added to storyboard
sheyoshida Oct 10, 2015
7091057
swipe gestures for first three screens enabled
sheyoshida Oct 11, 2015
c413a26
connected iTunes search API
Oct 11, 2015
608dd30
added identifier
sheyoshida Oct 11, 2015
229bf16
merged files
Oct 11, 2015
d1187e2
merge confilicts fixed, all is well
sheyoshida Oct 11, 2015
fab446a
removed segues from storyboard
sheyoshida Oct 11, 2015
c93bd52
let's eat some lunch
sheyoshida Oct 11, 2015
82cdc76
working tableview
Oct 11, 2015
7597393
added navigation controllers
sheyoshida Oct 11, 2015
664737c
merged conflicts == resolved
Oct 11, 2015
ec81078
pushing
sheyoshida Oct 11, 2015
bafe2f3
pass data to createJournalEntry
Oct 11, 2015
97dc31a
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 11, 2015
e374498
swipe push working
sheyoshida Oct 11, 2015
79d83b1
added identifier
sheyoshida Oct 11, 2015
7af4396
js update
Oct 11, 2015
84aff15
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 11, 2015
67079ae
updated some functionality and some parts of storyboard
Oct 12, 2015
8b38a83
added open source tab bar
sheyoshida Oct 12, 2015
ae1a71d
updated code -JS
Oct 12, 2015
4c14e4d
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 12, 2015
e43e136
added segue
sheyoshida Oct 12, 2015
76b8b8b
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 12, 2015
420a6b8
added journalpost.h class
Oct 12, 2015
80eb24c
fixed segue
sheyoshida Oct 12, 2015
dca7460
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 12, 2015
30a6fb1
added custom table view cells
sheyoshida Oct 12, 2015
fa3551f
moved segue
sheyoshida Oct 12, 2015
ab09e0f
moved wish list segue to cell
sheyoshida Oct 12, 2015
954b853
trying to pass data to JournalMain
Oct 12, 2015
c97cf68
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 12, 2015
6f725cb
able to add journal entry to JournalMainViewController
Oct 13, 2015
500674f
added book and podcast searchability
Oct 13, 2015
b96c756
added navigation controller
sheyoshida Oct 13, 2015
9ae6b28
tried to pass data to wishlist
Oct 13, 2015
d9efd68
star rating system up and working
sheyoshida Oct 13, 2015
2fe30ab
refactored rating code
sheyoshida Oct 13, 2015
588bcda
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 14, 2015
10020cb
journal entry returns to correct tab bar item
sheyoshida Oct 14, 2015
804b4af
removed extra tab bar buttons
sheyoshida Oct 14, 2015
edf4333
create entry pops back to first view
sheyoshida Oct 14, 2015
335a5ab
adding second API search for TV results
Oct 14, 2015
db49e27
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 14, 2015
41b184b
animated stars
sheyoshida Oct 14, 2015
45eb77d
updated JS files
Oct 15, 2015
2e66c76
added TV searchability
Oct 15, 2015
03328e6
added movie searchability
Oct 15, 2015
f43cbbb
Parse now saves journal entry
sheyoshida Oct 16, 2015
1761152
added more notes
sheyoshida Oct 16, 2015
ca0c9db
fixed podcast connection to Parse
sheyoshida Oct 16, 2015
81c4d39
parse data fills collection cells but images are missing
sheyoshida Oct 17, 2015
e6de8da
images running on collection view
sheyoshida Oct 18, 2015
4c30424
updated launch screen
Oct 18, 2015
ec3978e
now we can pull data from Parse and populate the wishlist
sheyoshida Oct 18, 2015
c44f37c
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
sheyoshida Oct 18, 2015
9ef69ee
update JS
Oct 18, 2015
20e19a9
properties created for completed review controller
sheyoshida Oct 18, 2015
af5e5de
pass data to detailVC
Oct 18, 2015
4736491
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 18, 2015
ff270e2
added Akkurat Fonts
Oct 18, 2015
b247ee3
updated JS
Oct 18, 2015
9a27888
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 18, 2015
9007a37
added heading to storyboard
sheyoshida Oct 18, 2015
9795a58
launch screen text in progress
Oct 18, 2015
a98cc0c
in progress
Oct 18, 2015
796ac65
in progress
Oct 18, 2015
7a8bb9c
in progress
Oct 18, 2015
f913a33
storyboard changed
sheyoshida Oct 18, 2015
f360090
changed storyboard
sheyoshida Oct 18, 2015
4dedc76
took off class from launch screen
Oct 18, 2015
7a52aab
deleted class from launch
Oct 18, 2015
e7638b8
fixed launchscreen error
Oct 18, 2015
75b71a6
woooooo
sheyoshida Oct 18, 2015
9d0d393
let's fix the loading screen
sheyoshida Oct 18, 2015
8f5de77
commit to pull jamaal
Oct 19, 2015
31cd664
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 19, 2015
a6fc25a
view added for jamaal
sheyoshida Oct 19, 2015
3fd74e1
adjusted UI and search reloads once submitted
sheyoshida Oct 19, 2015
ebbb7ca
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 20, 2015
0d9726f
added facebook shareability
Oct 20, 2015
feb37b3
added settings View controller files and facebook login
Oct 20, 2015
285c01d
changed social view color
sheyoshida Oct 20, 2015
cf9a160
fixed wishlist
Oct 20, 2015
b894f62
wishlist items can be reviewed and move to journal view
sheyoshida Oct 21, 2015
5bcd1a2
added files and fixed merge conflict
sheyoshida Oct 21, 2015
671a422
fixed indentation
sheyoshida Oct 21, 2015
fa57206
added stars to facebook and hopefully fixed the no-subtitle bug
Oct 21, 2015
4be507b
added Review: to reviews
Oct 21, 2015
41484f6
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 21, 2015
25f5e5d
added additional Parse functionality and a header in the collection view
sheyoshida Oct 22, 2015
1b6eaa4
fixed custom cells
sheyoshida Oct 22, 2015
b3d2b77
one more
sheyoshida Oct 22, 2015
181b90d
fixed SearchAPI controller flow and empty textview handling
Oct 22, 2015
4f54340
Merge branch 'master' of https://github.com/Jamaal51/unit-2-final-pro…
Oct 22, 2015
9e3a168
change WatchWishlist labels to white
Oct 22, 2015
2c8afd5
added swipe to delete on WishList TableView
Oct 22, 2015
273b0cc
swipe to delete added
Oct 22, 2015
527021a
fixed merge conflict
sheyoshida Oct 22, 2015
70f952c
fixed spacing
sheyoshida Oct 22, 2015
4d3c99e
button text
sheyoshida Oct 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Unit-2-Journal/.DS_Store
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions Unit-2-Journal/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pod 'FBSDKCoreKit', '~> 4.7'
pod 'FBSDKShareKit', '~> 4.7'
pod 'FBSDKLoginKit', '~> 4.7'
pod 'Parse'
pod 'RestKit/Testing', '~> 0.24.0'
pod 'FoldingTabBar', '~> 1.0.1’
pod 'pop', '~> 1.0'


69 changes: 69 additions & 0 deletions Unit-2-Journal/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
PODS:
- AFNetworking (1.3.4)
- Bolts (1.3.0):
- Bolts/AppLinks (= 1.3.0)
- Bolts/Tasks (= 1.3.0)
- Bolts/AppLinks (1.3.0):
- Bolts/Tasks
- Bolts/Tasks (1.3.0)
- FBSDKCoreKit (4.7.0):
- Bolts (~> 1.1)
- FBSDKCoreKit/arc (= 4.7.0)
- FBSDKCoreKit/no-arc (= 4.7.0)
- FBSDKCoreKit/arc (4.7.0):
- Bolts (~> 1.1)
- FBSDKCoreKit/no-arc (4.7.0):
- Bolts (~> 1.1)
- FBSDKCoreKit/arc
- FBSDKLoginKit (4.7.0):
- FBSDKCoreKit
- FBSDKShareKit (4.7.0):
- FBSDKCoreKit
- FoldingTabBar (1.0.1)
- ISO8601DateFormatterValueTransformer (0.6.1):
- RKValueTransformers (~> 1.1.0)
- Parse (1.9.0):
- Bolts/Tasks (>= 1.3.0)
- pop (1.0.8)
- RestKit/Network (0.24.1):
- AFNetworking (~> 1.3.0)
- RestKit/ObjectMapping
- RestKit/Support
- SOCKit
- RestKit/ObjectMapping (0.24.1):
- ISO8601DateFormatterValueTransformer (~> 0.6.0)
- RestKit/Support
- RKValueTransformers (~> 1.1.0)
- RestKit/Support (0.24.1):
- TransitionKit (~> 2.1.0)
- RestKit/Testing (0.24.1):
- RestKit/Network
- RKValueTransformers (1.1.2)
- SOCKit (1.1)
- TransitionKit (2.1.1)

DEPENDENCIES:
- FBSDKCoreKit (~> 4.7)
- FBSDKLoginKit (~> 4.7)
- FBSDKShareKit (~> 4.7)
- FoldingTabBar (~> 1.0.1)
- Parse
- pop (~> 1.0)
- RestKit/Testing (~> 0.24.0)

SPEC CHECKSUMS:
AFNetworking: cf8e418e16f0c9c7e5c3150d019a3c679d015018
Bolts: 805a4a87413e49d4a0c2b7d469084cbc46b09342
FBSDKCoreKit: eb580bfc2040ad44f4c0b4f4d0befb1d35bce59c
FBSDKLoginKit: 01bce8dd3f3a26a023b0ba4ffdde7ef5062889fe
FBSDKShareKit: 1f927bb05e4d36a99d5d5bf2f4b1ff294ce3e15c
FoldingTabBar: 3e04c49dbe2b02c529561a4182bf017b928d04d2
ISO8601DateFormatterValueTransformer: 52da467d6ec899d6aedda8e48280ac92e8ee97e6
Parse: 712efbc476d4f47b0f96b70db7e53101575753aa
pop: bb773ae2c791ca2629de13b347e7a8b450fa6a57
RestKit: 1987b5efef289c6b27bd980714d6ca48d3871b78
RKValueTransformers: 66ac5e4f077fdbe3496e792d89eeff4c3eb67701
SOCKit: c7376ac262bea9115b8f749358f762522a47d392
TransitionKit: 3a14b6acc7cf2d1dd3e454e24dbad1cfab9a1ef1

COCOAPODS: 0.39.0
641 changes: 641 additions & 0 deletions Unit-2-Journal/Pods/AFNetworking/AFNetworking/AFHTTPClient.h
View file
Open in desktop

Large diffs are not rendered by default.

Loading