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.

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

Merge master back to develop for v1.27.0 #2202

Merged
merged 8 commits into from
Apr 30, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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: 2 additions & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
* [iOS] Floating toolbar, previously located above nested blocks, is now placed at the bottom of the screen
* Fix the icons in FloatingToolbar on RTL mode
* [Android] Add alignment options for heading block
* Fix quote block so it visually reflects selected alignment
* Fix Quote block so it visually reflects selected alignment
* Fix bug where buttons in page templates were not rendering correctly on web

1.26.0
------
Expand Down
2,347 changes: 1,187 additions & 1,160 deletions bundle/android/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ar.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_bg.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_bo.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ca.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_cs.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_cy.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_da.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_de.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_el.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_enau.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_enca.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_engb.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ennz.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_enza.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_es.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_esar.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_escl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_escr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_fa.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_fr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_gl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_he.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_hr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_hu.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_id.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_is.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_it.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ja.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ka.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ko.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_nb.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_nl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_nlbe.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_pl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_pt.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ptbr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ro.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ru.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sk.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sq.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_sv.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_th.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_tr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_uk.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_ur.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_vi.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_zhcn.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/raw/i18ncache_data_zhtw.json

Large diffs are not rendered by default.

2,359 changes: 1,193 additions & 1,166 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ar.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/bg.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/bo.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ca.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/cs.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/cy.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/da.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/de.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/el.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/en-au.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/en-ca.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/en-gb.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/en-nz.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/en-za.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/es-ar.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/es-cl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/es-cr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/es.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/fa.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/fr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/gl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/he.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/hr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/hu.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/id.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/is.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/it.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ja.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ka.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ko.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/nb.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/nl-be.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/nl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/pl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/pt-br.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/pt.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ro.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ru.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/sk.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/sq.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/sr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/sv.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/th.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/tr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/uk.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/ur.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/vi.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/zh-cn.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/assets/i18n-cache/data/zh-tw.json

Large diffs are not rendered by default.