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/12.7 into Master #10126

Merged
merged 33 commits into from
Jul 2, 2019
Merged

Merge Release/12.7 into Master #10126

merged 33 commits into from
Jul 2, 2019

Conversation

loremattei
Copy link
Contributor

Merge Release/12.7 into Master

khaykov and others added 30 commits June 18, 2019 15:49
@khaykov
Fixed issues with domain contact form.
297374b
@khaykov
Fixed test.
fad03d8
@khaykov
Pointing Flux-C reference to latest commit.
cf3dc75
@khaykov
Merge pull request #10063 from wordpress-mobile/issue/10062-fixing-do…
c6e7726 
…main-contact-form

Fixed issues with domain contact form.
@loremattei
12.7-rc-2 / 740 version bump
00bdc21
@loremattei
Update FluxC reference
1b02928
@khaykov
Adding a 10 seconds delay between completion of AT and fetching of pl…
0a44f51 
…ugin directory.
@maxme
Fix #10093: remove the configureView() in ThemeWebActivity and preven…
eee8de8 
…t overriding
@maxme
Allow to open a theme preview when offline
2605cd3
@malinajirka
Merge pull request #10103 from wordpress-mobile/issue/10093-npe-theme…
8191c81 
…-webactivity-viewmodel-12.7

Fix #10093: Fix a NPE in the theme webactivity
@malinajirka
Revert: Start uploadService as foreground service (656e726)
7c32ea4
@maxme
Merge pull request #10105 from wordpress-mobile/issue/10096-upload-se…
6bda5b2 
…rvice-not-started-in-foreground

Revert: Start uploadService as foreground service (656e726)
@khaykov
Added retry logic for fetching plugin directory.
2ee6582 
Removed "Congrats" screen after domain registration.
Start plugin installation imidiately after domain registration is complete.
@khaykov
Fixed request code, updated logging, removed redundant code.
e40005e
@khaykov
Increased plugin retry delay to 10 seconds.
0f531df
@loremattei
Merge pull request #10095 from wordpress-mobile/fix/upgrade-fluxc
cdbc9e5 
Update FluxC reference
@khaykov
Added descriptive SSL error message, delay when registering domain name.
effc139
@khaykov
Naming.
8fbb918
@loremattei
Bump version to 12.7-rc-3/742
969e7b5
@khaykov
Changed action after domain registration and dispatching plugin confi…
4093d05 
…gure action after AT.
@khaykov
Removed dedicated message for no ssl error in favor of more general one.
79797c1
@khaykov
Manually setting domain as a primary after it registered.
d845303
@khaykov
Updated tests.
58baf9e
@khaykov
Fixed checkstyle issues, naming.
0491d03
@khaykov
Removed multispaces.
5d469e1
@khaykov
Null guard for DomainRegistrationPurpose passed with intent, private …
afa7ffe 
…domainRegistrationPurpose.
@khaykov
Updated error message handling.
28b3905
@khaykov
Fresh flux-c commit hash.
066fd32
@khaykov
Merge branch 'release/12.7' of github.com:wordpress-mobile/WordPress-…
051dba7 
…Android into issue/10100-accounting-for-server-side-delay-during-some-requests

# Conflicts:
#	build.gradle
@khaykov
Merge pull request #10101 from wordpress-mobile/issue/10100-accountin…
2ee4b63 
…g-for-server-side-delay-during-some-requests

Address AT issues after domain registration
@loremattei loremattei added the Releases Label related to managing releases label Jul 1, 2019
@loremattei loremattei added this to the 12.8 ❄️ milestone Jul 1, 2019
@loremattei loremattei requested a review from jtreanor July 1, 2019 10:38
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@loremattei loremattei merged commit f6262da into master Jul 2, 2019
@loremattei loremattei deleted the release/12.7 branch July 15, 2019 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtreanor jtreanor jtreanor approved these changes

Assignees
No one assigned
Labels
Releases Label related to managing releases
Projects
None yet
Milestone
12.8
Development

Successfully merging this pull request may close these issues.
5 participants
@loremattei @jtreanor @khaykov @maxme @malinajirka