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/11.0 into Master #8417

Merged
merged 260 commits into from
Oct 12, 2018
Merged

Merge Release/11.0 into Master #8417

merged 260 commits into from
Oct 12, 2018

Conversation

loremattei
Copy link
Contributor

Merge Release/11.0 into Master

malinajirka and others added 30 commits September 4, 2018 15:52
@malinajirka
Replace JSONObject with FormattableContent in UserNoteBlock java
500e9e0
@malinajirka
Replace JSONObject with FormattableContent in FooterNoteBlock.java
1ad43f9
@malinajirka
Fix null checks in NoteBlocks
8deae7c
@malinajirka
Update FluxC version
af21698
@malinajirka
Update FluxC hash -> add FormattableContent and related classes
665e9be
@malinajirka
Replace JSONObject with FormattableContent in CommentUserNoteBlock.java
7218516
@planarvoid
Add FormattableContent into ActivityLogModel instead of text field
1bbd9be
@malinajirka
Update FluxC hash -> add type and nest_level to FormattableContent
b722e58
@malinajirka
Replace JSONObject with FormattableContent in NoteBlock and its desce…
b25b6f8 
…ndants
@malinajirka
Replace JSONObject with FormattableContent in HeaderNoteBlock
024158e
@planarvoid
Bump FluxC version to include the new model and call its method
7e5cbd8
@malinajirka
Replace complex if statements in NoteBlock with FormattableContentUtils
e92a2c8
@malinajirka
Move injected fields into constructor in NotificationsUtilsWrapper
e7eb157
@malinajirka
Merge branch 'feature/extract-notifications' of github.com:wordpress-…
b22fd4f 
…mobile/WordPress-Android into feature/extract-notifications
@malinajirka
Merge branch 'feature/extract-notifications' into feature/extract-not…
0b1c0df 
…ifications-remove-raw-json
@planarvoid
Merge pull request #8274 from wordpress-mobile/feature/extract-notifi…
2d38404 
…cations

Feature/extract notifications
@malinajirka
Fix NPE check in FormattableContentUtils
58a5684
@malinajirka
Merge branch 'feature/working-branch-extract-notifications' into feat…
f70e8e7 
…ure/extract-notifications-remove-raw-json
@malinajirka
Fix line length in NotificationsUtilsWrapper
fdd7d72
@planarvoid
Add missing FormattableContent field instead of text to Activity Log …
bde0040 
…models
@planarvoid
Create a FormattableContent click handler with click handling from No…
4f4c5f9 
…tificationsDetailActivity
@planarvoid
Generate spannable content in activity log detail and handle clicks
80cb978
@planarvoid
Add MovementMethod to TextView in order to make spannable content cli…
706c4bc 
…ckable
@malinajirka
Replace JSONObject with FormattableContent in NoteBlocks - refactorin…
3d515e6 
…g/clean up
@malinajirka
Fix getRangeValueOrEmpty in FormattableContentUtils
4320f26
@malinajirka
Add test for FormattableContentUtils
30dc422
@planarvoid
Move click handlers from functions to direct calls to ViewModel + tests
fb7906d
@planarvoid
Fix too long line
d817e2e
@planarvoid
Move domain field to constant
bbaef5c
@planarvoid
Remove unnecessary line breaks and add log for unexpect range type
7bc7b8b
daniloercoli and others added 28 commits October 4, 2018 15:00
@daniloercoli
Add button selector for bottom bar
1fea477
@daniloercoli
NavBar - change the icon tint to the new color selector
249291a
@nbradbury
Merge pull request #8395 from wordpress-mobile/issue/8370-fix-Bottom-…
8f6df73 
…Navigation-Does-Not-Tint-Icon

Fix bottom navigation button that does not tint icon when selected on API 21
@khaykov
Using lowercase locale when building notification links.
69f0964
@khaykov
Using locale with toLowerCase call.
9f8c0af
@daniloercoli
Merge pull request #8398 from wordpress-mobile/issue/8220-lowercase-l…
8a0805e 
…ocale-for-notification-links

Using lowercase locale when building notification links.
@khaykov
Allow for removal of width height attributes of images.
9aef2c2
@khaykov
- Reworked image slider implementation
e3e4da9 
- Calculating and setting images width and height parameters based on selected size.
- Checkstyle fixes
@khaykov
Renamed resources, image sizes as integers.
5dec878
@khaykov
Fixes around new image size calculations.
2ec8411
@khaykov
Formatting, fixed comment
d248252
@khaykov
Updated MediaSettingsImageSize model.
9f9e792
@khaykov
Merge pull request #8400 from wordpress-mobile/issue/8234-use-width-h…
ddc8e0d 
…eight-attributes-for-image-size

Issue/8234 use width height attributes for image size slider
@0nko
Simplify boolean condition
7feaa79
@0nko
Refactor the upload snackbar message for non-published/scheduled status
a7f4c27
@0nko
Update the post/page upload notification title based on the status
5e1dc10
@0nko
Consider the pending status a form of a draft
680dc91
@0nko
Fix a checkstyle issue with "?"
4c519c1
@0nko
Use a different message for posts that are not publishable
b1fc6c4
@daniloercoli
Merge pull request #8371 from wordpress-mobile/issue/8318-publish-now
9308900 
Fix for the broken editor menu item
@0nko
Merge branch 'develop' into issue/post-cause-of-change
1ee3841 
# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/viewmodel/pages/ActionPerformer.kt
#	WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
#	WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt
#	build.gradle
@0nko
Merge pull request #8306 from wordpress-mobile/issue/post-cause-of-ch…
ca612cd 
…ange

Reflect CauseOfOnPostChanged changes in FluxC
@loremattei
Solve merge conflicts
22f4abf
@loremattei
Fix merge conflicts
0cf8c41
@loremattei
Merge pull request #8411 from wordpress-mobile/merge-10.9.2-into-develop
465c9ea 
Merge 10.9.2 into develop
@loremattei
11.0 / 623 version bump
5527269
@loremattei
Bump version to 11.0-rc-1
f994186
@loremattei
Update metadata
72bbc33
@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 cc5c0fd into master Oct 12, 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.