Skip to content

Conversation

@nbradbury
Copy link
Contributor

Fix for #373

@maxme
Copy link
Contributor

maxme commented Dec 5, 2013

Looks good

maxme added a commit that referenced this pull request Dec 5, 2013
…aying-comment

Issue/373 approve overlaying comment
@maxme maxme merged commit 72a769b into develop Dec 5, 2013
@maxme maxme deleted the issue/373-approve-overlaying-comment branch December 5, 2013 16:22
maxme added a commit that referenced this pull request Jun 10, 2016
b207f3f Merge pull request #406 from wordpress-mobile/issue/405-invisible-separator-html-mode
40618cc Merge pull request #407 from wordpress-mobile/sync-wpandroid
d9e4113 Bumped Travis target SDK version to 16
4ed7e84 Bumped example app midSdk to 16
88fc198 Merge commit 'a4c57ecdddaac606bb9da697c055ccd3c78162e3' into sync-editor
af266b4 Updating gradle plugin to 2.1.2
af4f18b Escape invisible unicode separator characters in HTML mode
d62ddc3 Merge pull request #402 from wordpress-mobile/issue/401-empty-blockquote-off-new-post
5664496 Fixed removing leftover newline when clearing blockquotes on API 21+
84bc04c Merge pull request #399 from wordpress-mobile/issue/385-autocorrect-blockquote-bug
58fb473 When removing an empty blockquote in an otherwise empty post, ensure no leftover paragraph tags are left and that the placeholder is visible again
43d673a Fixed issue of being unable to toggle off empty blockquotes at the start of posts on API19 and below
49042e7 Merge branch 'develop' into issue/385-autocorrect-blockquote-bug
9b0eb28 Merge pull request #400 from wordpress-mobile/issue/398-old-api-new-post-blockquote
94c7577 Fix #398, buggy blockquote paragraphs at start of posts (API 19 and below)
93d0b11 Fix issue with autocorrect removing blockquotes at start of post when backspacing
aacd3b4 Made matching for autocorrect blockquote fix stricter
30b54bf Fix bug where autocorrect can toggle blockquote off at the start of posts
5bfd024 Correct extra break tag sometimes added in blockquotes by autocorrect
054448f Merge branch 'hotfix/5.4.1' into release/5.5
88c040e Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1
e116f48 Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size
9d0a8bf Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1
0aec1e3 Merge branch 'hotfix/5.4.1' into issue/4147-translated-original-size
c801408 fix an issue with initial max width value in legacy image settings
c3798b5 Update to latest utils version
fbb73ab use MediaUtils.getImageWidthSettingFromString instead of referring to 'Original Size'
a22d95f Merge pull request #4161 from wordpress-mobile/issue/391editor-fix-legacy-image-settings
5032dde Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1
e37555f associate the mediafile with newly created image span
613c9ce Don't attempt to remove image selection formatting if the image is no longer attached to the document
e8ff0d8 On API 19 and below, don't set focus on the container when showing the edit overlay
7d03ec2 When applying the edit image overlay, give focus to the edit container instead of the image
dfed869 Merge branch 'release/5.4' into release/5.5
e98a21f check for null parameters in createWPEditImageSpanRemote
939948e fix #4137: check if context and media file is null
3f9f44e Merge branch 'release/5.4' into develop
6561baa Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4
09c3838 Merge branch 'release/5.4' into develop
751e919 Block media button if action in progress
3bea532 fix editor tests
9fcf821 Don't allow publishing if insert image or insert video action in progress
021572c fix wordpress-mobile/WordPress-Editor-Android#294: Block HTML mode until insert image or video has finished
95dea3f Merge pull request #4121 from wordpress-mobile/issue/294editor-block-switch-to-html-mode-until-insert-image-finished
8edbac6 Merge branch 'release/5.4' into develop
32b150c Block media button if action in progress
fabde1c bump minSdkVersion from 14 to 16
c6f0c2a remove specific code for API < 16 in editor
a64e81f fix editor tests
45f2000 Don't allow publishing if insert image or insert video action in progress
d060f82 fix wordpress-mobile/WordPress-Editor-Android#294: Block HTML mode until insert image or video has finished
dc40200 chmod 644 image files
8d6f9f1 Merge commit '3418d3e2da66bf5ecc19b5e073794c866711e776' into develop
e334198 Merge pull request #3856 from wordpress-mobile/issue/3791-support-library-23.2
6448d26 Updating to support library 23.4.0
178aa19 Merge branch 'develop' into issue/3791-support-library-23.2
6ae6ec3 Improved error message displayed when failing to load visual editor HTML
b7a48b3 Merge branch 'develop' into feature/magic-link
efe90e8 Merge branch 'develop' into feature/magic-link
f9ef8f5 Merge branch 'develop' into feature/magic-link
ad37b12 Merge branch 'develop' into feature/magic-link
639a45b Merge branch 'develop' into feature/magic-link
57fc6b4 Merge branch 'develop' into feature/magic-link
61a180a Adding MissingPrefix ignore rule to Editor as well
6981157 Merge branch 'develop' into issue/3791-support-library-23.2
52f96bc Button is no longer screen width and extracting string resource
0039a31 Updating support library to 23.3.0
893b509 Updating to gradle 2.0
28ec9a8 Merge branch 'develop' into issue/3791-support-library-23.2
a28cf69 Updating build.gradle to latest rc3
1b9d708 Merge branch 'develop' into issue/3791-support-library-23.2
dabacd6 Updating the rest of the modules to buildToolsVersion 23.0.3
4b40e3f Merge branch 'develop' into issue/3791-support-library-23.2
ae9e36d Converting all android:src to app:srcCompat to handle VectorDrawables
2fa6196 Changing all Activity classes to AppCompatActivity to handle vector drawables
49304a0 Merge branch 'develop' into issue/3791-support-library-23.2
b28d697 Merge branch 'develop' into issue/3791-support-library-23.2
ada1d86 Updating support library to 23.2.1

git-subtree-dir: libs/editor
git-subtree-split: b207f3f831a674d28add9b391c0d55559a9d8be6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants