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

Update develop with master v1.26.0 #2164

Merged
merged 3 commits into from
Apr 16, 2020
Merged

Update develop with master v1.26.0 #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
315a213
Release v1.26.0 (#2153)
pinarol Apr 16, 2020
a00db10
Update gb ref
pinarol Apr 16, 2020
4dad2d3
Merge branch 'develop' into master_1.26_to_develop
pinarol Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* [iOS] Disable ripple effect in all BottomSheet's controls.
* [Android] Disable ripple effect for Slider control
* New block: Columns
* New starter page template: Blog
* Make Starter Page Template picker buttons visible only when the screen height is enough
* Fix a bug which caused to show URL settings modal randomly when changing the device orientation multiple times during the time Starter Page Template Preview is open

1.25.0
------
Expand Down
2,200 changes: 1,108 additions & 1,092 deletions bundle/android/App.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions bundle/android/raw/gutenberg_packages_blocklibrary_src_button_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@
"source": "html",
"selector": "a"
},
"backgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
},
"linkTarget": {
"type": "string",
"source": "attribute",
Expand All @@ -48,12 +36,6 @@
},
"borderRadius": {
"type": "number"
},
"gradient": {
"type": "string"
},
"customGradient": {
"type": "string"
}
}
}
6 changes: 0 additions & 6 deletions bundle/android/raw/gutenberg_packages_blocklibrary_src_paragraph_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
"placeholder": {
"type": "string"
},
"fontSize": {
"type": "string"
},
"customFontSize": {
"type": "number"
},
"direction": {
"type": "string",
"enum": [
Expand Down
2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_de.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_es.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ro.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sk.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sq.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sv.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_tr.json
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 23 additions & 4 deletions bundle/android/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- translators: sample content for "Contact" page template -->
<string name="gutenberg_native_10_street_road" tools:ignore="UnusedResources">10 Street Road</string>
<!-- translators: sample content for "Contact" page template -->
<string name="gutenberg_native_555_555_1234" tools:ignore="UnusedResources">(555)555-1234</string>
<string name="gutenberg_native_555_555_1234" tools:ignore="UnusedResources">(555)555–1234</string>
<!-- translators: sample content for "Portfolio" page template -->
<string name="gutenberg_native_a_description_of_the_project_and_the_works_presented" tools:ignore="UnusedResources">A description of the project and the works presented.</string>
<!-- translators: sample content for "Contact" page template -->
Expand All @@ -31,7 +31,8 @@
<string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
<string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
<string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
<string name="gutenberg_native_background_opacity" tools:ignore="UnusedResources">Background Opacity</string>
<!-- translators: title for "Blog" page template -->
<string name="gutenberg_native_blog" tools:ignore="UnusedResources">Blog</string>
<string name="gutenberg_native_border_radius" tools:ignore="UnusedResources">Border Radius</string>
<string name="gutenberg_native_border_settings" tools:ignore="UnusedResources">Border Settings</string>
<string name="gutenberg_native_button_color_settings_are_coming_soon" tools:ignore="UnusedResources">Button color settings are coming soon.</string>
Expand All @@ -40,7 +41,10 @@
<!-- translators: sample content for "Contact" page template -->
<string name="gutenberg_native_city_10100" tools:ignore="UnusedResources">City, 10100</string>
<string name="gutenberg_native_clear_all_settings" tools:ignore="UnusedResources">Clear All Settings</string>
<string name="gutenberg_native_color_settings_are_coming_soon" tools:ignore="UnusedResources">Color settings are coming soon.</string>
<string name="gutenberg_native_columns_settings" tools:ignore="UnusedResources">Columns Settings</string>
<string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
<!-- translators: %s: current cell value. -->
<string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
<string name="gutenberg_native_customize" tools:ignore="UnusedResources">CUSTOMIZE</string>
<!-- translators: sample content for "About" page template -->
Expand All @@ -52,6 +56,8 @@
<!-- translators: accessibility text -->
<string name="gutenberg_native_double_tap_to_edit_this_value" tools:ignore="UnusedResources">Double tap to edit this value</string>
<string name="gutenberg_native_double_tap_to_move_the_block_down" tools:ignore="UnusedResources">Double tap to move the block down</string>
<string name="gutenberg_native_double_tap_to_move_the_block_to_the_left" tools:ignore="UnusedResources">Double tap to move the block to the left</string>
<string name="gutenberg_native_double_tap_to_move_the_block_to_the_right" tools:ignore="UnusedResources">Double tap to move the block to the right</string>
<string name="gutenberg_native_double_tap_to_move_the_block_up" tools:ignore="UnusedResources">Double tap to move the block up</string>
<string name="gutenberg_native_double_tap_to_redo_last_change" tools:ignore="UnusedResources">Double tap to redo last change</string>
<string name="gutenberg_native_double_tap_to_remove_the_block" tools:ignore="UnusedResources">Double tap to remove the block</string>
Expand All @@ -64,13 +70,14 @@
<string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_dr_seuss" tools:ignore="UnusedResources">Dr. Seuss</string>
<string name="gutenberg_native_edit_cover_media" tools:ignore="UnusedResources">Edit cover media</string>
<string name="gutenberg_native_edit_media" tools:ignore="UnusedResources">Edit media</string>
<string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:[email protected]\"&gt;[email protected]&lt;/a&gt;</string>
<string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
<string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
<!-- translators: sample content for "Blog" page template -->
<string name="gutenberg_native_follow_our_blog" tools:ignore="UnusedResources">Follow our Blog</string>
<!-- translators: accessibility text. %s: gallery caption. -->
<string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
<!-- translators: sample content for "About" page template
Expand All @@ -94,6 +101,8 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_j_k_rowling" tools:ignore="UnusedResources">J.K. Rowling</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_juan_p_rez" tools:ignore="UnusedResources">Juan Pérez</string>
<!-- translators: sample content for "Blog" page template -->
<string name="gutenberg_native_latest_blog_posts" tools:ignore="UnusedResources">Latest Blog Posts</string>
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_let_s_build_something_together" tools:ignore="UnusedResources">Let’s build something together</string>
<!-- translators: sample content for "Services" page template -->
Expand All @@ -106,10 +115,15 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_link_settings" tools:ignore="UnusedResources">Link Settings</string>
<string name="gutenberg_native_link_text" tools:ignore="UnusedResources">Link text</string>
<string name="gutenberg_native_link_to" tools:ignore="UnusedResources">Link To</string>
<string name="gutenberg_native_minimum_height_in_pixels" tools:ignore="UnusedResources">Minimum height in pixels</string>
<string name="gutenberg_native_move_block_down" tools:ignore="UnusedResources">Move block down</string>
<!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
<string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block down from row %1$s to row %2$s</string>
<string name="gutenberg_native_move_block_left" tools:ignore="UnusedResources">Move block left</string>
<!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
<string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s" tools:ignore="UnusedResources">Move block left from position %1$s to position %2$s</string>
<string name="gutenberg_native_move_block_right" tools:ignore="UnusedResources">Move block right</string>
<!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
<string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s" tools:ignore="UnusedResources">Move block right from position %1$s to position %2$s</string>
<string name="gutenberg_native_move_block_up" tools:ignore="UnusedResources">Move block up</string>
<!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
<string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block up from row %1$s to row %2$s</string>
Expand All @@ -123,6 +137,7 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_my_pre_publish_panel" tools:ignore="UnusedResources">My pre publish panel</string>
<string name="gutenberg_native_navigate_up" tools:ignore="UnusedResources">Navigate Up</string>
<string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
<string name="gutenberg_native_number_of_columns" tools:ignore="UnusedResources">Number of columns</string>
<string name="gutenberg_native_only_show_excerpt" tools:ignore="UnusedResources">Only show excerpt</string>
<string name="gutenberg_native_open_settings" tools:ignore="UnusedResources">Open Settings</string>
<!-- translators: accessibility text. %s: Page break text. -->
Expand Down Expand Up @@ -150,7 +165,9 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_s_block_empty" tools:ignore="UnusedResources">%s block. Empty</string>
<!-- translators: accessibility text for blocks with invalid content. %d: localized block title -->
<string name="gutenberg_native_s_block_this_block_has_invalid_content" tools:ignore="UnusedResources">%s block. This block has invalid content</string>
<!-- translators: %s: Name of the block -->
<string name="gutenberg_native_s_isn_t_yet_supported_on_wordpress_for_android" tools:ignore="UnusedResources">\'%s\' isn\'t yet supported on WordPress for Android</string>
<!-- translators: %s: Name of the block -->
<string name="gutenberg_native_s_isn_t_yet_supported_on_wordpress_for_ios" tools:ignore="UnusedResources">\'%s\' isn\'t yet supported on WordPress for iOS</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_sally_smith" tools:ignore="UnusedResources">Sally Smith</string>
Expand All @@ -166,6 +183,8 @@ translators: sample content for "Services" page template -->
<string name="gutenberg_native_start_writing" tools:ignore="UnusedResources">Start writing…</string>
<!-- translators: sample content for "Services" page template -->
<string name="gutenberg_native_strategy" tools:ignore="UnusedResources">Strategy</string>
<!-- translators: sample content for "Blog" page template -->
<string name="gutenberg_native_subscribe" tools:ignore="UnusedResources">Subscribe</string>
<string name="gutenberg_native_success_message" tools:ignore="UnusedResources">Success Message</string>
<string name="gutenberg_native_take_a_photo" tools:ignore="UnusedResources">Take a Photo</string>
<string name="gutenberg_native_take_a_photo_or_video" tools:ignore="UnusedResources">Take a Photo or Video</string>
Expand Down
Loading