Merging 0.7 into Master #297
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… feature/35-neworders-mark1 * 'develop' of github.com:woocommerce/woocommerce-ios: Remove duplicate code, revert enum to string Restore original spacing Update enum to Swift 4 standards Code review changes - move the section identifier to an extension in the main project Revert "Title label and body label table view cell for Settings" Title label and body label table view cell for Settings Move the human-readable string function to Order+Woo. Translate computed section name into friendly string. Move sectionIdentifier method to the CoreDataClass, because Order+Woo is read-only Add a .normalizeDate() to date helpers Set the sectionNameKeyPath to "sectionIdentifier" Change required for something a VC needs, so these changes belong in Order+Woo Set keyPath when init'ing resultsController Expose custom core data method Add core data entity methods
…ark1 Top Performers Mark1: Adds networking framework logic
Orders List: Empty + Error States
… feature/178-top-performers-mark2 * 'develop' of github.com:woocommerce/woocommerce-ios: (25 commits) OverlayMessageView: Updating StackView Distribution OverlayMessageView: MessageLabel is now multiline OrdersViewController: Removes extra spaces OverlayMessageView: Attach now disables tAMC OrdersViewController: Updates message OrdersViewController: Removes extra space OrdersViewController: Documents transitions OrdersViewController: Supporting Empty + Filtered State OrdersViewController: Reverts Testing Code Revert to this commit to test: Error State Revert to this commit to test: Empty State OrdersViewController: Handling "Share your Store" Action OrdersViewController: State Management OrdersViewController: Updates Sync Signature OrdersViewController: Placeholder Orders Management OrdersViewController: Wire renamed constants OrdersViewController: Implements FSM Management OrdersViewController: Nes State Enum Implements OverlayMessageView UIImage+Woo: New Assets ...
…ark2 Top performers Mark2: Storage + Yosemite fmwk support
…-deletion Delete order items and coupons if they are removed on the server
Dashboard: Fix chart "flash" when switching tabs
Collaborator
Generated by 🚫 Danger |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.