118 Commits

Author SHA1 Message Date
Okechi Onyeje
09cb0691fd All Production settings active programmatically 2016-11-19 22:13:39 -05:00
Okechi Onyeje
fc98abd596 Merged branch BUG-Fix-Login-Logout-Buttons-For-Networks into master 2016-11-19 20:31:36 -05:00
Okechi Onyeje
d11d2f0e60 Login/Logout Button fixed 2016-11-19 20:31:30 -05:00
Okechi Onyeje
6ba4044d86 Merged branch BUG-Load-Collection-Views-Dynamically into master 2016-11-19 19:09:58 -05:00
Okechi Onyeje
c23641af56 Dynamic Collection Views Implemented 2016-11-19 19:08:48 -05:00
Okechi Onyeje
8ddfd551b0 Merged branch master into BUG-Load-Collection-Views-Dynamically 2016-11-19 05:55:01 -05:00
Okechi Onyeje
0a67217442 small fix to categories for etsy integration 2016-11-18 19:24:43 -05:00
Okechi Onyeje
bb50322181 Merged branch BUG-Fix-Posting-Images-To-Etsy into master 2016-11-18 19:19:53 -05:00
Okechi Onyeje
3fb9e4251c Fixed Etsy integration and Set up ListingPreview for posting images 2016-11-14 09:15:56 -05:00
Okechi Onyeje
f23c70e669 Merged branch BUG-Post-Multiple-Images-Ebay into master 2016-11-12 22:01:57 -05:00
Okechi Onyeje
2c179e70b2 Multiple Images now posting to Ebay 2016-11-12 22:01:14 -05:00
Okechi Onyeje
ed66ebaa45 Merged branch Rapid-Dev-Branch into master 2016-11-10 21:35:15 -05:00
Okechi Onyeje
c4aa936973 Merged branch RDB-Notification-Manager into Rapid-Dev-Branch 2016-11-10 21:21:46 -05:00
Okechi Onyeje
aa2c54afd8 Added full support for ebay and etsy limited notifications 2016-11-10 21:21:09 -05:00
Okechi Onyeje
2e1ce8adb3 Merged branch RDB-Notification-Manager into Rapid-Dev-Branch 2016-11-10 09:16:27 -05:00
Okechi Onyeje
9861802bb5 Reimplemented notifications for facebook 2016-11-10 09:15:43 -05:00
Okechi Onyeje
ec3bab8b14 Merged RDB-Notification-Manager into Rapid-Dev-Branch 2016-11-03 22:50:57 -04:00
Okechi Onyeje
bf987b6418 Facebook Notifications and Notifications view controller implemented 2016-11-03 22:48:49 -04:00
Okechi Onyeje
518fbb3e1e Etsy Ended and Sold notifications implemented 2016-10-31 00:52:43 -04:00
Okechi Onyeje
5df12695df Ebay Ended and Sold notifications completed. Sold, Unsold, and Selling completed 2016-10-05 08:53:06 -04:00
Okechi Onyeje
98ef13a0e6 Merge branch 'Rapid-Dev-Branch'
Conflicts:
	.DS_Store
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Vendoo/.DS_Store
2016-10-03 09:03:39 -04:00
Okechi Onyeje
75d4a3e869 Merged branch RDB-Fix-Autologin-Bug into Rapid-Dev-Branch 2016-09-26 11:47:35 -04:00
Okechi Onyeje
240d953efb Auto-login bug fixed 2016-09-26 11:47:20 -04:00
Okechi Onyeje
987ea4ed61 Merged RDB-Fix-Toggle-Btn-Bug into Rapid-Dev-Branch 2016-09-26 10:55:28 -04:00
Okechi Onyeje
62634193c5 Toggle button bug fixed when selecting posting networks 2016-09-26 10:54:04 -04:00
Okechi Onyeje
20a142cfaa Merged branch RDB-Chang-Img-Selection-Btn-Name into Rapid-Dev-Branch 2016-09-19 09:17:48 -04:00
Okechi Onyeje
be967509d8 Item Selection and Capture Buttons names are changed 2016-09-19 09:17:06 -04:00
Okechi Onyeje
704af98cc7 Merged branch master into Rapid-Dev-Branch 2016-09-19 08:45:59 -04:00
Okechi Onyeje
ec8d5569e7 Merged Posting-New-Etsy-Listings into master 2016-09-19 08:29:44 -04:00
Okechi Onyeje
cd73a57eab app icons beta preview submission 2016-09-19 08:28:58 -04:00
Okechi Onyeje
9e46c214af Merge branch 'master'
Conflicts:
	.DS_Store
2016-09-07 18:49:56 -04:00
Cole Alban
1aa8923d34 Merge remote-tracking branch 'origin/master' 2016-09-07 18:19:41 -04:00
Okechi Onyeje
a01758cccd fixed pod stuff
also added error handling for case when firebae says app runs out of storage
2016-09-07 17:44:07 -04:00
Okechi Onyeje
5dfd6adba6 Merge branch 'master'
Conflicts:
	.DS_Store
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods.xcodeproj/project.pbxproj
	Pods/Pods.xcodeproj/xcuserdata/okechi.xcuserdatad/xcschemes/xcschememanagement.plist
	Pods/SOAPEngine/README.md
	Pods/SOAPEngine/SOAPEngine64.framework/Headers/SOAPEngine.h
	Pods/SOAPEngine/SOAPEngine64.framework/Info.plist
	Pods/SOAPEngine/SOAPEngine64.framework/SOAPEngine64
	Pods/SOAPEngine/SOAPEngine64.framework/_CodeSignature/CodeDirectory
	Pods/SOAPEngine/SOAPEngine64.framework/_CodeSignature/CodeResources
	Pods/SOAPEngine/SOAPEngine64.framework/_CodeSignature/CodeSignature
	Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
	Pods/Target Support Files/AeroGearHttp/AeroGearHttp.xcconfig
	Pods/Target Support Files/AeroGearOAuth2/AeroGearOAuth2.xcconfig
	Pods/Target Support Files/Alamofire-SwiftyJSON/Alamofire-SwiftyJSON.xcconfig
	Pods/Target Support Files/Alamofire/Alamofire.xcconfig
	Pods/Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout.xcconfig
	Pods/Target Support Files/BSImagePicker/BSImagePicker.xcconfig
	Pods/Target Support Files/Bolts/Bolts.xcconfig
	Pods/Target Support Files/FBSDKCoreKit/FBSDKCoreKit.xcconfig
	Pods/Target Support Files/FBSDKLoginKit/FBSDKLoginKit.xcconfig
	Pods/Target Support Files/FBSDKShareKit/FBSDKShareKit.xcconfig
	Pods/Target Support Files/GDataXML-HTML/GDataXML-HTML.xcconfig
	Pods/Target Support Files/Locksmith/Locksmith.xcconfig
	Pods/Target Support Files/OAuthSwift/OAuthSwift.xcconfig
	Pods/Target Support Files/PicoKit/PicoKit.xcconfig
	Pods/Target Support Files/Pods-Vendoo/Pods-Vendoo.debug.xcconfig
	Pods/Target Support Files/Pods-Vendoo/Pods-Vendoo.release.xcconfig
	Pods/Target Support Files/Pods-VendooTests/Pods-VendooTests.debug.xcconfig
	Pods/Target Support Files/Pods-VendooTests/Pods-VendooTests.release.xcconfig
	Pods/Target Support Files/Pods-VendooUITests/Pods-VendooUITests.debug.xcconfig
	Pods/Target Support Files/Pods-VendooUITests/Pods-VendooUITests.release.xcconfig
	Pods/Target Support Files/SWRevealViewController/SWRevealViewController.xcconfig
	Pods/Target Support Files/SwiftyJSON/SwiftyJSON.xcconfig
	Pods/Target Support Files/TYMActivityIndicatorView/TYMActivityIndicatorView.xcconfig
	Pods/Target Support Files/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.xcconfig
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Vendoo/EtsyRESTAPIManager.swift
	Vendoo/ListingPreviewViewController.swift
2016-09-07 16:42:10 -04:00
Okechi Onyeje
a3177e1cae Merge branch 'Rapid-Dev-Branch'
Conflicts:
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Vendoo/EbayWebServiceManager.swift
2016-09-07 09:49:26 -04:00
Okechi Onyeje
1dad88464f Merged branch Rapid-Dev-Branch into master 2016-09-07 09:44:37 -04:00
Okechi Onyeje
54d2236fac fixed some small bugs due to integration work 2016-09-07 09:41:20 -04:00
Okechi Onyeje
8c39ce11c8 Merged branch RDB-Make-Detail-View-for-Listings-View into Rapid-Dev-Branch 2016-09-07 09:06:08 -04:00
Okechi Onyeje
c52c2d850a Detail View Completed with multi-images, however duplicates are being shown right now 2016-09-07 09:05:36 -04:00
Okechi Onyeje
495557ab84 Merge branch 'Rapid-Dev-Branch'
Conflicts:
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
2016-09-07 08:13:24 -04:00
Okechi Onyeje
5b7c1d73f0 Merged branch BUG-Multiple-Image-Uploads into Rapid-Dev-Branch 2016-09-07 08:10:52 -04:00
Okechi Onyeje
94d3fe05ac multiple images for facebook works 2016-09-07 08:10:22 -04:00
Okechi Onyeje
481c12c587 Detail View completed 2016-09-07 07:20:54 -04:00
Cole Alban
ec85d80a9a Fixed Keyboard issue for iPhone 6 2016-09-07 02:19:09 -04:00
Okechi Onyeje
ecc8d90d3c Merge branch 'Rapid-Dev-Branch'
Conflicts:
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Vendoo/ListingPreviewViewController.swift
2016-09-06 07:08:40 -04:00
Okechi Onyeje
50911da49d Merged branch Rapid-Dev-Branch into RDB-Make-Detail-View-for-Listings-View 2016-09-06 06:23:15 -04:00
Okechi Onyeje
7fe2378194 set up delegation for notifications 2016-09-06 06:21:25 -04:00
Okechi Onyeje
6e8ca0cfde Merge branch 'Rapid-Dev-Branch'
Conflicts:
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
	Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Vendoo/EbayWebServiceManager.swift
2016-09-04 08:52:01 -04:00
Okechi Onyeje
286c9361f5 Merged branch RDB-Dismiss-Ebay-Auth-Webview into Rapid-Dev-Branch 2016-09-04 08:41:23 -04:00
Okechi Onyeje
14d41254b3 Can now dismiss webview and revokeToken bug fixed
auth problem was an ebay server side issue that was fixed early this morning
2016-09-04 08:40:50 -04:00