Skip to content

Merging Mark 0.5 into Master #233

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

Jump to bottom
Merged
merged 142 commits into from
Aug 13, 2018
Merged

Merging Mark 0.5 into Master #233

merged 142 commits into from
Aug 13, 2018

Conversation

@jleandroperez
Copy link
Contributor

@jleandroperez jleandroperez commented Aug 13, 2018

No description provided.

mindgraffiti and others added 30 commits July 27, 2018 14:17
@mindgraffiti
Temporariliy point to new Authenticator changes
3c37928
@mindgraffiti
Add new color definitions from Woo handbook
50ad6f9
@mindgraffiti
Add the Woo logo to assets
53e1aaf
@mindgraffiti
pod update
3218213
@bummytime
WIP: OrderStats models and remote
d4574bf
@bummytime
Added OrderStatsMapper
5fa9cbf
@bummytime
Param name fix
16c7c80
@bummytime
WIP: OrderStatsMapper tests
e3768c0
@bummytime
Merge branch 'develop' of github.com:woocommerce/woocommerce-ios into…
76449b0 
… feature/177-dashboard-mark1

* 'develop' of github.com:woocommerce/woocommerce-ios:
  Updating Build to Mark 0.4.2
  Podfile: Dropping armv7 architecture
  Dropping ARMv7 Architecture
@jleandroperez
Increasing version to Mark 0.4.3
bfd6d1c
@jleandroperez
Nukes CoreDataManager+Woo
7c4ec47
@jleandroperez
AppDelegate: StorageManager property
43af64c
@jleandroperez
CoreDataManager: Nuking viewContext property
e5c2688
@jleandroperez
ResultsController: New convenience initializer
72df052
@jleandroperez
StorePickerViewController: Nuking Storage Import
62d6593
@jleandroperez
OrderDetailsViewController: Nuking Storage Import
ea66e1a
@jleandroperez
AuthenticatedState: OrderDetailsViewController
acf4bc1
@jleandroperez
Model: Exporting Storage Model(s)
4c14406
@bummytime
Updates order stats models, decoder, and tests
cca4c59
@astralbodies
Eliminate the .debug app ID and enable push notifications
faea35a
@jleandroperez
ResultsController: MutableType Alias
d2d1b81
@jleandroperez
Storage: Removing xcdatamodeld from build phase
e1ec411
@jleandroperez
Implements ResultsController+UIKit
ed098bf
@jleandroperez
Updates Project
6f3af9d
@jleandroperez
MockupStorage: Nukes viewContext
22a0349
@jleandroperez
Implements MockupStorageManager:Sample
54a4b93
@jleandroperez
Yosemite: Exporting Storage.Account
df1bfb9
@jleandroperez
Yosemite: Simplifying ResultsController Tests
17d93fc
@jleandroperez
Implements MockupTableView
0eab005
@jleandroperez
MockupTableView: Fixing Typo
e695ab1
mindgraffiti and others added 26 commits August 7, 2018 11:43
@mindgraffiti
Point to new WordPressAuthenticator version 1.0.5, pod install.
752ed2f
@mindgraffiti
Merge branch 'develop' into feature/more-configurations
29e0f5c
@mindgraffiti
Merge pull request #195 from woocommerce/feature/more-configurations
53025ea 
More WPAuth styling options
@jleandroperez
ReadOnlyConvertible: Cleanup
3b97541
@jleandroperez
EntityListener: Wiring TypeErased protocol
dbed12d
@jleandroperez
Implements ReadOnlyRepresentation
8380ef8
@jleandroperez
ReadOnlyRepresentation > ReadOnlyType
f39b175
@jleandroperez
Implements ReadOnlyType Conformance
e120351
@jleandroperez
Relocates Model Files
76a34e3
@jleandroperez
Merge remote-tracking branch 'origin/develop' into issue/212-entity-l…
97d505f 
…istener
@jleandroperez
ReadOnlyType: Adds missing documentation
08a0aef
@jleandroperez
Merge pull request #222 from woocommerce/issue/212-entity-listener
ff658d9 
EntityListener: ReadOnly.Entity <> Storage.Entity Bindings!
@jleandroperez
Merge remote-tracking branch 'origin/develop' into issue/208-fixing-x…
f4e0eb7 
…code10-warnings
@jleandroperez
WooAnalyticsTests: Fixing typo
962559f
@jleandroperez
Merge pull request #213 from woocommerce/issue/208-fixing-xcode10-war…
6eecb62 
…nings

Fixing Xcode 10 Warnings and Errors
@jleandroperez
OrderListMapper: New Unit Test
e615bdd
@jleandroperez
Updates broken-orders-mark-2.json
2cb0e1b
@jleandroperez
OrderItem: sku is now optional
a1600eb
@jleandroperez
OrderListMapperTests: new Unit Test
3d806e5
@jleandroperez
OrderItemViewModel: Handling null SKU
461c183
@jleandroperez
ProductDetailsTableViewCell: Handling null SKU
300b1a5
@jleandroperez
OrderStoreTests: New Unit Test
bea9d5b
@jleandroperez
Merge pull request #227 from woocommerce/issue/221-orders-list-empty
0065cd7 
Fix: Empty Order List
@bummytime
Updating the bg color of the order screens
e46689d
@bummytime
Merge pull request #231 from woocommerce/fix/order-bg-color
59c7ae6 
Updates the background color on the order screens
@jleandroperez
Increasing Version to Mark 0.5
8e30b2b
@jleandroperez jleandroperez self-assigned this Aug 13, 2018
@jleandroperez jleandroperez merged commit 056e419 into master Aug 13, 2018
@wpmobilebot
Copy link
Collaborator

wpmobilebot commented Aug 13, 2018

3 Warnings
⚠️ PR is missing at least one label.
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
⚠️ PR is not assigned to a milestone.

Generated by 🚫 Danger

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jleandroperez jleandroperez

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jleandroperez @wpmobilebot @mindgraffiti @bummytime @astralbodies