Skip to content
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

Merge release/10.8 into master #8255

Merged
merged 303 commits into from
Aug 30, 2018
Merged

Merge release/10.8 into master #8255

merged 303 commits into from
Aug 30, 2018

Conversation

loremattei
Copy link
Contributor

Merge release/10.8 into master

theck13 and others added 30 commits June 1, 2018 12:25
@theck13
Revert "Add table for quick start"
8a623e2 
This reverts commit 3cc05f5.
@theck13
Revert "Add database for quick start"
99954ab 
This reverts commit 55fd32c.
@khaykov
Updated reference to flux-c
6da469d
@khaykov
Visible Quick Start menu item that leads to actual activity.
e8e3e53
@khaykov
Skip All dialog changed to FragmentDialog, congrats message visible a…
4b59bd4 
…fter skipping all tasks, create your site taks is allways "done", refactoring here and there.
@khaykov
Refactoring, checkstyle fixes.
0e18a62
@khaykov
Protect unused strings.
9cc6599
@khaykov
Slimed down activity a bit.
dc7b2f3
@khaykov
Bit more refactoring.
cbf9f8a
@khaykov
Make tasks not clickable after they are done.
41eaa53
@khaykov
Tiny refactoring.
8097dbe
@khaykov
Quick start activity to fragment.
fdc80c9
@khaykov
Added quick start view model.
9828d7b
@khaykov
Minor refactoring.
3194523
@khaykov
Quick Start ViewModel test
f2e7643
@khaykov
Refactoring here and there, cleaning things up a bit.
7a54d13
@khaykov
Comments, tiny refactoring.
b22d9fd
@khaykov
Using AlertDialog instead of fragment dialog.
e14b3cc
@khaykov
Minor refactoring, cleaning up.
96d12eb
@khaykov
fixed ktlint issue
7e1ca4f
@khaykov
Merging changes from upstream.
28d50ad
@khaykov
Merge branch 'feature/whats-next' of github.com:wordpress-mobile/Word…
a5cb76d 
…Press-Android into issue/7710-whats-next-progress

# Conflicts:
#	build.gradle
@planarvoid
Merge pull request #7844 from wordpress-mobile/issue/7710-whats-next-…
368f7eb 
…progress

Issue/7710 whats next progress
@khaykov
Launching QuickStart activity and returning result from it.
8ef59aa
@khaykov
Propagating quick start activity result to MySite fragment, and code …
9617858 
…for handling quick start snackbar.
@khaykov
Changes to visual appearance of quick start snackbar.
dbdee59
@khaykov
Initial tutorial prompts and utility for making quick start snackbar …
8140297 
…label with icon.
@khaykov
Show quick start snackbar after returning from quick start activity.
42c0aeb
@khaykov
Fixed checkstyle, minor refactoring.
f251b9e
@khaykov
Removing angry new line
3d3108e
theck13 and others added 28 commits August 26, 2018 21:38
@theck13
Update deep indented parentheses of multi-line method calls for code …
c71dad0 
…readability
@khaykov
Renamed quick start tracking events and updated tracking format.
ff7f94f
@khaykov
Renamed quicks tart trackers in references.
435dd06
@khaykov
Referenced latest flux-c commit.
ec02ced
@khaykov
AnalyticsTracker.Stat -> Stat
80ccc30
@khaykov
Fixed ktlint.
7eac73e
@khaykov
More description quick start task dialog name.
bfab987
@khaykov
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
8e32bc6 
…id into feature/whats-next

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
#	build.gradle
@theck13
Merge pull request #8228 from wordpress-mobile/feature/quick-start-an…
605e60f 
…alytics

Feature/quick start analytics
@khaykov
Removed missing mergeing artifact.
a7fdbab
@theck13
Merge pull request #8239 from wordpress-mobile/feature/whats-next
34a613f 
Feature/whats next
@mzorz
removing MediaEditFragment and migrating MediaGridFragment to support…
f3138a5 
… fragment
@mzorz
using support fragment in Publicize section
0f3c86f
@mzorz
removed unused layout file
c8aecb6
@malinajirka
Merge pull request #8240 from wordpress-mobile/try/migrate-media-supp…
1290fb3 
…ort-fragment

Support fragment migration: Media
@malinajirka
Merge pull request #8241 from wordpress-mobile/try/migrate-support-fr…
2f7af37 
…agment-publicize

Support fragment migration: Publicize section
@planarvoid
Merge pull request #8232 from wordpress-mobile/issue/deep-indented-pa…
f9b84df 
…rentheses

Issue/deep indented parentheses
@planarvoid
Merge pull request #8231 from wordpress-mobile/issue/jetpack-install-…
9c7444a 
…drawables

Issue/jetpack install drawables
@loremattei
Fix merge conflicts
8be17a0
@loremattei
10.8-rc-1 / 609 version bump
4c640a1
@mzorz
bump Aztec version to v.1.3.8
750f684
@loremattei
Merge pull request #8245 from wordpress-mobile/update/aztec-138
3927064 
Bump Aztec version to v.1.3.8
@loremattei
Merge release/10.7 into release/10.8
f981026
@loremattei
Merge branch 'release/10.7' into release/10.8
e417b88
@khaykov
Updated flux-c reference.
ef6ee0d
@khaykov
Updated flux-c reference.
46047bb
@mzorz
Merge pull request #8249 from wordpress-mobile/issue/fixing-quick-sta…
dbc0c32 
…rt-db-migration

Fixing Quick Start DB migration from 10.7 to 10.8
@loremattei
Update metadata
4bb6618
@wpmobilebot
Copy link
Contributor

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

@loremattei loremattei merged commit 5916d89 into master Aug 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.