Issue/update build tools #3919
Merged
Issue/update build tools #3919
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
aforcier
added a commit
that referenced
this pull request
May 2, 2016
31b66df 1.0 version bump d8cfe4a Merge commit '4542685e8fcd0e490279dde87f9ac3d8887bc0af' into develop afc78d8 Merge pull request #4024 from wordpress-mobile/feature/update-gradle-plugin 004c6f7 Merge commit '99075045579437eb0928d9fb5b363cf5d1774870' into develop fb0e980 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 6c4808f Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop 9ae36fe Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure ababd1c Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image 2ce6b79 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop ffad17f Use a static listener to handle reflection failures 544415f Updates the p/div conversion regex to more strictly match tags dded955 Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread 318297e Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop 33becb0 Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update 0a0f0b3 Merge branch 'develop' into issue/editor-p-to-div-update 58a956e Merge pull request #3931 from wordpress-mobile/issue/fix-placeholder-title-in-french d61bf92 Merge commit 'd2f7ed4e05fa13e80fbe573f043fac43baf5e0b1' into issue/editor-p-to-div-update c8e62e4 Updating to gradle 2.0 9d753ca Updating to rc3 593ebad Escape quotes on translated strings when calling execJavaScriptFromString 58f5af0 Merge commit 'c5b98a88c01551e8dbf44366072607d364ec01dd' into develop 254b0ff Merge pull request #3919 from wordpress-mobile/issue/update-build-tools ff52240 Merge branch 'release/5.2' into release/5.3 ea50456 Updating the rest of the modules to buildToolsVersion 23.0.3 6242f89 Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop c3b97db Add missing classes for images inserted from media library - also fix a bug with undefined alt text 121472f Add missing attributes for uploaded images 2ad3224 update to android-gradle-2.0.0-rc1 9a21aea upgrade to gradle plugin 2.0.0-beta7 bd82e4a Merge commit 'c6efe0a9190244d40e64300efc9cca56ae5acd5c' into develop be6ebe4 Merge branch 'develop' into issue/120editor-initial-focus b3a84ec Merge commit '9b0b5fab24db9f435b278ad0b9e77d5895135700' into develop 36a6e42 Merge pull request #3897 from wordpress-mobile/issue/260editor-clear-failed-images-on-upload 1e94c99 Null check getParentRangeOfFocusedNode/setRange in onMutationObserved - in case editor is not in focus 5a54839 Show the software keyboard once the DOM has loaded 64e33ad Focus on the title field when opening posts 8f7ffc0 New EditorFragment method to removeAllFailedMediaUploads() d6e1ad4 New JS function ZSSEditor.removeAllFailedMediaUploads 4a37325 Merge pull request #3896 from wordpress-mobile/issue/300editor-broken-images-after-upload-2 ed8dd88 remove debug logs f57b0dc Use remoteurl in the link wrapper 08d94e3 Merge branch 'develop' into issue/300editor-broken-images-after-upload-2 942aae0 Merge branch 'develop' into issue/297editor-backspace-media 6b9a904 update to com.android.tools.build:gradle:2.0.0-beta7 29760e3 Merge branch 'develop' into issue/297editor-backspace-media b1a7083 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 6b30bb4 Changed MutationObserver handling to check if the WebView supports it, rather than rely on API levels 821761e Refactor: grouped mutation observation methods together a3dcf52 Refactored DOM element mutation listening, delegating everything to one trackNodeForMutation method ccef356 Changed MutationObserver behavior to track individual media nodes instead of each contenteditable div 4ea4f78 Moved failed media methods to the generic media method group 2092016 Parse for failed media when returning from HTML to visual mode 5100726 Track DOMNodeRemoved events when parsing for failed media 1a19b59 Fixed a variable name error in ZSSEditor.removeImage ed7f31a On API<19, use DOMNodeRemoved events to track media deletions (instead of the unsupported MutationObserver used for newer APIs) f486c02 Merge branch 'develop' into issue/297editor-backspace-media f9567c6 Merge pull request #3804 from wordpress-mobile/issue/enable-editor-debug-mode c5c01c9 Consume KEYCODE_VOLUME_UP event when debug print is called 130483c Merge commit 'a299686f47294c20ef04e818585f1d27cf069876' into develop 5e5b844 broken retries d75ff0e Merge branch 'issue/enable-editor-debug-mode' into issue/300editor-broken-images-after-upload-2 af79e8f use a remoteUrl attribute to avoid seeing broken image if download failed 5810af1 remove debug action bar button and log raw html when volume up button is pressed f4b7ac1 fix function call errors 9139f65 Add back image swapping onError ef45a99 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 806b6bf fix wordpress-mobile/WordPress-Editor-Android#300: Retry download onError after an upload 549a6fc add missing comment d520eff Updated gradle to 2.0.0-beta6 d439504 Fixes an issue where manually deleting uploading/failed media will cause the caret to disappear 0cc5dfd Notify native through a callback whenever uploading/failed media are manually deleted 96700b9 catch a common JS exception b635d38 Merge branch 'develop' into issue/288editor-log-js-errors-in-crashlytics a3686a8 fix wordpress-mobile/WordPress-Editor-Android#288: new EditorWebViewAbstract.ErrorListener used to forward JS errors to Crashlytics efc6ec5 Keep the format bar disabled on rotation when the title field is in focus 587d66f Rely on ZSSEditor to flag uploads as completed in native-side checks 792d1c4 Added null checking for MediaType onMediaUploadFailed b189ef7 Wait until the ZSSEditor has replaced the local media with remote before marking it as completed 2e8946e Strip any trailing when returning the title e42eea1 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 2ca8ce1 Editor 0.6 version bump 1c0540f Updated localized string calls in ZSSEditor video methods 215b8b5 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 64adac4 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor ae7b2f3 Escape quotes for URLs being passed to the JS editor 76cd747 Use hasAttribute to null-check when parsing for failed media items 39530c9 Wrapped called to getThumbnailURL in notNullStr() in the editor fragment 8432230 Removed unnecessary console.logs 09a223d Drop data-failed attribute from ZSSEditor.insertLocalVideo 009ac85 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 527203c escape single quotes when calling execJavaScriptFromString c505184 Use API<19 compatibility upload UI for video (imported from images) 2632d17 Include videos in count of failed media uploads 1e88177 Mark uploading videos as failed when opening a post containing them, so they can be retried faae80f Send VideoPress shortcode and poster URL to visual editor when video upload completes 6284c49 Stop adding unnecessary 'data-wpid' attributed to completed video uploads 8a2e68a fix wordpress-mobile/WordPress-Editor-Android#285: markImage(Video)UploadFailed now called with 2 parameters f0201bf Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 1f2ddda Merge branch 'develop' into feature/visual-editor 07b45a2 Upgrade gradle plugin to 2.0.0-beta5 0e7e34a Update gradle version in wrapper a92f6d9 fix MockEditorActivity for tests f96974f Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes bd8dbc7 Centralized tracking of added images/videos 7e655c8 Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 3ddf22b Merge branch 'develop' into feature/visual-editor 4d6f33d Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 4d7a3b9 update to android gradle plugin beta4 2b4a5c1 update to android gradle plugin 2.0.0-beta-2 - Instant Run 80ff799 Updating to latest versions of internal dependencies 6353f44 Keeping internal dependencies always pointing to the latest version 0fb699f Merge commit 'c0c935fa4b3b6135be8099b637da57bede6b850f' into feature/visual-editor 4751ae7 Hide video fullscreen button 4a6c8e0 Pause video playback when the WebView is no longer visible to the user 8a0612d Use a blank placeholder src instead of videopress.mp4 to trigger videopress video loading a9e079c Added some sanity checks for substring usage to JsCallbackReceiver 2fa2dca Fixed a bug where videos would sometimes get deleted if they were the only thing in the post a21951b Added support for video shortcodes on non-VideoPress sites 80bd71c Merge branch 'feature/visual-editor' into feature/editor-video-playback aaa9a6f Added missing bracket in JS editor e712ebb Follow redirects when requesting thumbnails for the image settings dialog 79c7d4f Always defer to super.shouldInterceptRequest in editor WebView unless an auth header is present c7fc77a Merge branch 'feature/visual-editor' into feature/editor-video-playback 0bee8d0 When looking up a VideoPress ID in the DB fails, refresh the blog media and check again 585fc21 Remove the onError attribute from VideoPress videos if an empty video url is returned 1d4069a Added the ability to tap a placeholder VideoPress video to attempt to load it e23bf9b Don't use the placeholder poster image for videopress videos d44cbf0 Add space after videos when converting from VideoPress shortcode 192618b Only apply custom headers for network URL resource requests 3c995f5 Implement new EditorFragmentListener method in mock activity for integration tests f82188a Convert VideoPress shortcodes to video elements and back in the visual editor 97023b4 Imported ZSSRichTextEditor video methods and callback methods from iOS 72426b2 Imported video CSS from iOS bec5a06 Added missing method implementation to test mock activity 103623b Retrieve an auth header if necessary when launching the image settings dialog 710c082 Use the safeToAddWordPressComAuthHeader utility method for resource requests in the new editor's WebView e4c9f6d Updated the utils artifact version for the editor f1e18c4 Moved setupUrlConnection() to the utils library 0329b10 Renamed EditorFragment's setWebViewHeader to setCustomHttpHeader faee37a Use custom headers for image settings dialog image requests 296428c Extracted some duplicated HttpURLConnection building code into a utility method 7c682a6 When an Authorization HTTP header is detected, force using the HTTPS protocol in the WebViewClient 3726c81 Added support for custom headers to the editor's WebView, set through the EditorFragmentAbstract 151f080 Editor 0.5 version bump ada768f Added full support for gallery types f936194 Added a fix enabling galleries to be added to the editor before the DOM loads 1c7a1bf Fixed creating a new post by making a gallery from the Media Library (the gallery wasn't being added to the new post) f507455 Merge branch 'feature/visual-editor' into feature/editor-galleries 66dae11 Merge branch 'feature/visual-editor' into feature/editor-sync-0.5 b127139 Merge branch 'develop' into feature/visual-editor 0976ed9 Merge branch 'develop' into feature/editor-sync-0.5 22551ca Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 660bb7b Added support for creating galleries from local images, using a placeholder shortcode while uploading b52cb96 Extracted duplicate paragraph-wrapping code into a separate method in the ZSS editor 2bd2a5a Added support for inserting galleries using media library images 62bdbe6 Merge branch 'feature/visual-editor' into feature/editor-featured-images 7774382 Merge branch 'develop' into feature/visual-editor 41266f4 Removed unused 'Include image in post content' checkbox from image settings 6edd755 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 644ef03 Use a callback instead of a getter to notify the host activity when the featured image changes b31f404 Add the remote media id to image tags when inserting from media gallery 3ef00a0 Hide the featured image checkbox if feature images aren't supported c3e966c Updated Editor example project with changes to onMediaUploadProgress a2e9a1f Fixed a crash issue in the image settings dialog fragment 4937797 Converted featured id handling methods to be part of EditorFragmentAbstract 1ebad36 Added support for getting and setting the featured image id to the editor fragments 8e8b133 Don't clear all class data in ZSSEditor.markImageUploadDone b093ba1 Add the remote image ID to the image tag when an image upload completes 78c7c58 Added support for setting/unsetting an image as featured to the image settings dialog 74f416e Modified onMediaTapped to pass the image meta data as a JSONObject 1f138a0 Fixed a broken test and an issue with the editor demo activity 5cd8946 Implemented missing method in EditorFragmentAbstractTest 78bd8f8 Added some empty string checking when retrieving failed media ids from the ZSSEditor 2776cc0 Adjusted the pattern used by the ZSSEditor to find images that are uploading 2aaf4be Disable editor format bar buttons when post/page contains failed uploads ed5a4de Updated EditorFragment to handle exiting the editor with media uploads in progress more gracefully d616642 Added a 'delete' flag to onMediaUploadCancelClicked e50e3a2 Fixed a bug where the media upload progress bar wouldn't display due to a localization issue 198fe03 Visual editor lib version bump 4bdf8a4 Updated image settings dialog to always clear the custom ActionBar view 4a0aba9 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 20fb4b2 Updating build tools to 23.0.1 9118aa4 Merge branch 'release/4.4' into develop 6d81897 set targetSdkVersion to 23 and clean up lib dependencies e242e52 migrate from mavenCentral to jcenter (which is now the default for Android Studio) 1f16160 upgrade subtrees to latest android tools f708f98 update to gradle plugin 1.3.1 and gradle 2.6 844d144 Merge branch 'develop' into feature/update-to-gradle-2.4 bb0b502 upgrade to gradle 2.5 and gradle plugin 1.3.0 4771109 Merge branch 'develop' into feature/update-to-gradle-2.4 6b5919c Merge branch 'develop' into feature/update-to-gradle-2.4 dd890da update to gradle android plugin 1.2.3 c090cb9 update support lib to 22 72fd793 update to android-gradle plugin 1.1.3 and build tools 22.0.1 git-subtree-dir: libs/editor git-subtree-split: 31b66df6436e7911e5a272914ea63b888452e7f9
maxme
added a commit
that referenced
this pull request
Jun 22, 2016
c2484a2 bump version to 1.10.0 2f7330c gradle wrapper now uses gradle v2.11 755e012 new MediaUtils function: getImageWidthSettingFromString 9a1e358 Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 961a76c Squashed 'libs/editor/' changes from fa030e4..10ae495 4d4a62d Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 5da21ed Squashed 'libs/editor/' changes from 31b66df..fa030e4 89dc10d Clarify comments and parameter names 924cafd fix #4114: remove the URL scheme if it's not http or https during URL sanitization ce16255 Merge branch 'develop' into feature/gravatar-upload-okhttp 3b37573 Squashed 'libs/editor/' changes from 0b74389..31b66df 4542685 Squashed 'libs/editor/' changes from 8818dd1..0b74389 9907504 Squashed 'libs/editor/' changes from 17887d3..8818dd1 62c0633 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 ac1a4af Squashed 'libs/editor/' changes from abfcce5..17887d3 d421635 Adds permission utils for calling via fragments be4aac0 Squashed 'libs/editor/' changes from 72933eb..abfcce5 57027fd Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop c0f0848 Squashed 'libs/editor/' changes from 7be0b57..72933eb 52910dd Squashed 'libs/editor/' changes from 41a1010..7be0b57 d2f7ed4 Squashed 'libs/editor/' changes from 0f6fba8..41a1010 31b7405 Updating to gradle 2.0 556b07f Updating to rc3 c5b98a8 Squashed 'libs/editor/' changes from a35d654..0f6fba8 dba14e7 Merge pull request #3919 from wordpress-mobile/issue/update-build-tools ca0ddf7 Merge branch 'release/5.2' into release/5.3 439ac00 Updating the rest of the modules to buildToolsVersion 23.0.3 0ce206f Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 4c9324c Squashed 'libs/editor/' changes from f1f6d10..a35d654 290f00a update to android-gradle-2.0.0-rc1 23312dd upgrade to gradle plugin 2.0.0-beta7 c6efe0a Squashed 'libs/editor/' changes from bed2a4e..f1f6d10 9b0b5fa Squashed 'libs/editor/' changes from eb8d070..bed2a4e 2f8ebef update to com.android.tools.build:gradle:2.0.0-beta7 7b3b47e Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 2689888 Comment getQuantityString() 6551031 use String.format(getString(format), ...) instead of buggy getString(format, ...) b2ac4fe replace plurals with a utility method cf7abc9 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 8db246f Squashed 'libs/editor/' changes from 2b066be..eb8d070 c34f307 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop a299686 Squashed 'libs/editor/' changes from 57802bf..2b066be 259c0cc Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9cd77b6 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop a03a146 Squashed 'libs/editor/' changes from 7f3b589..57802bf bcba708 Mark the util WPEditText as deprecated 0f6791c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 487d833 Updated gradle to 2.0.0-beta6 e6a2785 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9ca8561 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 108ed89 Squashed 'libs/editor/' changes from 50ddd25..7f3b589 d624527 Merge branch 'develop' into feature/visual-editor 346be68 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 714085f Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor 87b5e7c Squashed 'libs/editor/' changes from 4832795..50ddd25 6335e6e Merge branch 'develop' into feature/visual-editor ad79aef Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager 63391ec Merge remote-tracking branch 'origin/develop' into feature/account-settings cb1661f Upgrade gradle plugin to 2.0.0-beta5 68c6f4c Squashed 'libs/editor/' changes from 69aaa8a..4832795 46aabfc Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes a667632 Merge remote-tracking branch 'origin/develop' into feature/account-settings 3194ade Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List aa8d9d5 Fix media isVideo/isValidImage/... utils method ebef08f Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 097b51b Squashed 'libs/editor/' changes from d99856b..69aaa8a fc52906 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop c0668eb Merge remote-tracking branch 'origin/develop' into feature/account-settings da10360 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 1e0ce6c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List b927220 Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 7b89b47 update to android gradle plugin beta4 abd8b59 Merge remote-tracking branch 'origin/develop' into feature/account-settings cdc50b8 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 4feb531 Reverts a previous unnecessary change that's accidentally committed for StringUtils 2bf5d02 update to android gradle plugin 2.0.0-beta-2 - Instant Run f7bbc16 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment 5d798e5 Use lowercase locale array to make sure language is pre-selected 4a9c2a3 Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it. 5ce9100 Merge remote-tracking branch 'origin/develop' into feature/account-settings ab0599a Download available plans for a site. Refactoring!! 0c37b48 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item e16984b Download global plans from wpcom and parse them. Store the response in AppPrefs for now. b6449a5 Primary site added to Account Settings (wip) ac00bae Adding SETTINGS log tag and logging unknown language code error c0c935f Squashed 'libs/editor/' changes from 6647346..d99856b 26983b7 Merge develop into site-settings-review faf8169 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop a0920e0 Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop 2a47170 Add utility methods to check if a URL is wpcom. Add utility methods that check if it's safe to add the Authentication token to the request. 3dc20d0 kill StringUtils.getHost function 0851eb3 s/getDomainFromUri/getHost/ 0bca2ec 4.9-rc-2 / 228 version bump fa39ced fix #3521: use the simplest UnderlineSpan subclass 8b485b6 Merge branch 'develop' into feature/site-settings-review f413bfd Allow photon to resize GIFs 4d1d85e Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop 4a4c685 Merge branch 'develop' into feature/site-settings-review 5de9f05 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 2467f23 Squashed 'libs/editor/' changes from ce4343d..6647346 8baae1f fix #3372:Resource Leak in SqlUtils.java 3fbefee Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop adcda50 Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop ef4143b Moved the check for video to within ImageUtils 41a29ce Merge branch 'develop' into feature/site-settings-review ec04675 suppress lint on missing permission 8eb155d Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 0b0e451 Add log line that could help us in case of errors in the JSON parsing with queryJSON. f214bff Merge branch 'develop' into feature/site-settings-review 83eb9d1 Better solution: Fix the url within PhotonUtils. Hattip @nbradbury 47d1e59 Revert "Fixes issue where private blog images wouldn't load." d632cb7 Revert "Killing whitespace." a60cce7 Killing whitespace. cc3dd96 Fixes issue where private blog images wouldn't load. b5937d6 Merge branch 'release/4.7' into feature/site-settings-review bc7772a Moved permission check and request to PermissionUtils 21634cb Checking media permission when attempting to add media to post e0721c8 Merge branch 'release/4.6' into issue/3115-runtime-permissions c3ad1f2 first step for runtime location request f376b01 Merge branch 'develop' into feature/site-settings-review bb91e9a Merge branch 'release/4.6' into develop bb4cb66 Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release ba3a532 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 7b6a9d4 Squashed 'libs/editor/' changes from 244a513..ce4343d 13bb8af test queryJSON calls with null params 181cebb Check null query string 68f5328 check null source in JSONUtils.queryJSON() 66d56be Merge branch 'develop' into feature/site-settings-review a9e602f update ProfilingUtils usage 9eeabd4 Merge branch 'develop' into feature/site-settings-review 2aaf29d Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string. 55037d2 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host. b534e1d URL Utils test fix bb2d893 Merge branch 'develop' into feature/site-settings-review 47cc553 generic approach to add parameters to a URL dc193f5 new UrlUtils method: appendPreviewURLParameter 7bf9eb9 Updating build tools to 23.0.1 619e359 Merge branch 'develop' into feature/site-settings-review 58440ae set targetSdkVersion to 23 and clean up lib dependencies 5b825d3 migrate from mavenCentral to jcenter (which is now the default for Android Studio) 6ad7e5c fix lint errors b7d5983 update to gradle plugin 1.3.1 and gradle 2.6 dd3729c upgrade to gradle 2.5 and gradle plugin 1.3.0 7d3506f Merge branch 'develop' into feature/update-to-gradle-2.4 cfe353e Merge branch 'develop' into feature/update-to-gradle-2.4 33111c4 Squashed 'libs/editor/' changes from e0a8651..244a513 f9336b1 Squashed 'libs/editor/' changes from a59304d..e0a8651 05d9908 Updating ActionBar title. Save button is now Undo. 5f30f53 Squashed 'libs/editor/' changes from 6c35434..a59304d 56693c5 Squashed 'libs/editor/' changes from 4125f05..6c35434 fcf0b6f Merge branch 'hotfix/4.1.1' into release/4.2 a576ec7 Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update 0105cee Updating EditTextUtils.getText method instead of creating new one. 3f98bb1 limit text to 524288 characters which is always < 2Mb with UTF-8 734f781 Merge branch 'hotfix/4.1.1' into release/4.2 bf3cd76 fix #2855: delete big comments and truncate new inserted comments df5f634 Squashed 'libs/editor/' changes from 77cb2fb..4125f05 661dc4f Coding Styles ac27e0f Make sure the context passed to checkConnection is not null 9eaf958 Squashed 'libs/editor/' changes from aec6410..77cb2fb fc2bc73 Updated support library and build tools 3ff99e3 update to gradle android plugin 1.2.3 4109f72 update support lib to 22 bb09a7b update to android-gradle plugin 1.1.3 and build tools 22.0.1 2f98d8a Introduce our version of MarkView 2aa392e Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted 4434b0f Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop 8658bd7 Fixed notifications fragment for self-hosted 40e798b Merge pull request #140 from wordpress-mobile/issue/18-format-bar-tablet 0bcd888 Merge branch 'release/4.0' into develop 4ace866 Removing potential race condition with WP image loading threads. 8786fed Returning to the post editor won't crash if Activity was destroyed. 2fe6c3f Merge branch 'develop' into issue/18-format-bar-tablet 8a1bf41 Merge pull request #138 from wordpress-mobile/issue/124-separate-files 559b7d8 Style updates. 9b89d36 Added support for strikethrough tag in EditorFragment efcde28 Added editor layout for tablets (sw600dp) 5e59531 Added selector for strikethrough button 3bf29a2 Added bigger HTML button drawables for tablet format bar 9239f92 Removed a lot of inline JS/CSS from the main editor html file. 64b83d3 Merge pull request #136 from wordpress-mobile/issue/132-formatbar-keyboard-old-api 2d7c9c4 Moved some WebView config code from EditorFragment to EditorWebViewAbstract c5882ba Merge remote-tracking branch 'remotes/origin/develop' into issue/132-formatbar-keyboard-old-api 566b8e6 Add more audio formats 0699bb6 Suppressed NewApi lint check for EditorWebView.execJavaScriptFromString c15b38c Handle audio files in media browser 8d5b424 Added compatibility WebView for API<19 with custom method for executing JS 4478cf3 Merge pull request #133 from wordpress-mobile/issue/10-format-bar-phone ba3c137 Pulled the EditorWebView layout element into a separate file b4a21f4 Modified EditorWebView to use WebView.evaluateJavascript on API>=19 ef8b078 Added EditorWebViewAbstract and replaced EditorWebView usage in EditorFragment 50524b9 Moved the format bar's left margin inside the scrollview 0d2a713 Shrank HTML button and tightened its margins 06c212a Merge branch 'release/4.0' into develop 056645f Merge branch 'hotfix/3.9.1' into release/4.0 c2d5a5e Catching other unknown URL exception. d08c926 Making sure Cursor is closed if exception gets thrown. ba751a2 Catching unknown URL exceptions. baa00c8 Removed unnecessary HTML button code f30f7be Merge branch 'release/4.0' into develop 1b6118d Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0 f144a88 Linked up format bar buttons to ZSSEditor methods 570ae57 Added unit test for Utils.buildMapFromKeyValuePairs bbba60a Added partial support for the callback-selection-changed JS callback bb8c537 Added format bar buttons and dividers to editor layout f1d2319 javadocs efe7e97 If string is empty return empty string instead of null 6e340ac Renamed format button highlighted underline dimens 315bb50 Relabeled legacy editor color assets 14c3938 Added new format bar icons and selectors 8303e45 Renamed legacy editor button selectors and images 6195fe0 Merge pull request #129 from wordpress-mobile/issue/23-extract-callback-handler 228a563 Qualified Utils static imports in UtilsTest 418d4b3 Some EditorFragment cleanup db3bd70 Added units tests for Utils 53821d7 Added units tests for JsCallbackHandler 862e533 Added some callback placeholders to JsCallbackReceiver with logging b746221 Renamed callback classes for clarity bedf027 Merge branch 'develop' into issue/23-extract-callback-handler eaa2f17 Merge pull request #21 from wordpress-mobile/feature/test-framework 5346958 Added a lint rule ignoring the 'InvalidPackage' check for Robolectric 83c3108 Added notes and logging for some currently unused JS callbacks 4c2f2d1 Downgrading plugin, tests aren't working with the new tools. 17ec76c Updating robolectric-gradle-plugin and the Android gradle build plugin. 201f7e7 Merge branch 'develop' into feature/test-framework abcf3e3 Moved some utility methods from EditorFragment to Utils 7f336ea Added a WebView sublcass, EditorWebView, and switched the editor to use that b7be242 Added handling for the "callback-selection-style" JS callback e9c6401 Updated onDomLoaded() to enable multiline support for the content field f1f933b Moved JsCallbackHandler to its own file 5da8d79 Added example format bar with bold button fc5f50d Merge pull request #22 from wordpress-mobile/feature/14-main-editor 3666662 Cleaned up EditorFragment 9645409 Changed project license from MIT to GPLv2 cfa2fe4 Fixed issue with JavaScript not loading on API<19 32591e0 Switched WebChromeClient onConsoleMessage to use debug log messages instead of error 10b5506 Updated to use build tools 21.1.2 54d20a7 Added title to editor example content 124981c Added travis build status to README 200efb8 Adding Robolectric test framework and JaCoCo code coverage reports. 124d3a9 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity c47d51e javadocs 152983e Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity ef0e582 README cleanup d16a6d5 Set default activity for example application 23fd043 Updated README with build instructions for Windows (fixes assets symlink) 87c8911 Added @SuppressLint for web debugging a5e31e8 Changed WordPress-Utils-Android dependency to maven artifact 7631e96 If string is empty return empty string instead of null d8522a9 Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer b626b4c 1.5.0 version bump d2cfae7 Merge branch 'develop' into feature/modularize-editor 88f29c5 JS to Java callback proof of concept d2aa4f3 Updated ZSSRichTextEditor to latest version ced12ea Auto-load an example HTML file in editor dd66e62 Updated common editor files and imported editor HTML file from iOS fd92adf Added support for `WPWebViewClient` to pass the token for image requests. 6a05144 Merge branch 'hotfix/3.8.1' into release/3.9 efa02b7 fix gallery placeholder icon 1d171d8 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation a6b5ecf Tapping a media gallery span opens gallery editor. 912f81a Adding missing override annotation. 58c9ae7 Using isVideo to determine if a file is a video. 1721d30 enable gallery handling 3ca1d97 remove unused code 9c806b5 first step at introducing the new media picker 28ca417 Merge branch 'develop' into feature/modularize-editor cec9c82 fix #2328: sort blogs with an empty title by their hostname c431408 Merge branch '1628-mediapicker' into feature/modularize-editor 94e0f77 rename and update editor colors 1b3b384 Merge branch 'develop' into feature/modularize-editor 1398d41 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor c0c684a comment CustomSwipeRefreshLayout.onTouchEvent 757b720 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException c9a7b99 Merge branch 'develop' into feature/modularize-editor 682b62b Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state 6083a1a Merge branch 'develop' into feature/modularize-editor 9f900a9 fix typo in a comment a9e6e49 delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712 63dbb16 styling update eeb819b Merge branch 'release/3.7' into develop 92791b4 Merge branch 'develop' into feature/modularize-editor f6ef4ce fix local draft style saving by introducing an awful "getSpannedContent()" method :( c3d9720 fix #2336: check for null text entry, replace them with a string 8f9d5e4 EditLinkActivity is now independent from the EditPostActivity 1d7067e add local draft / remote post example d33a9be make the legacy editor works in the example project 6f0d297 LegacyEditorFragment now lives in the editor subproject 2b5c737 split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 777635b split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 56d9289 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 0c60b07 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 11e6f7f use setFeaturedImageSupported instead of using WordPress.getCurrentBlog().isFeaturedImageCapable() fb3a66d appendMediaFile now able to load local media 59c4bc4 Merge branch 'develop' into feature/modularize-editor fe48809 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview 068e0df reenable appendMedia in LegacyEditorFragment 4f21616 All gravatar requests now default to 404. d847975 split methods to be usable on MediaFile instead of WPImageSpan 8978cb1 move WPEditImageSpan bitmap loading to the constructor ef8a893 Added DEFAULT_BLAVATAR constant 956d44c WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter 4f27696 Moved fixAvatar routine to GravatarUtils 9955a71 Added DefaultImage enum to GravatarUtils 2eba000 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 8141509 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 839f755 first step to remove getContentEditText/getTitleEditText aacdb40 Squashed 'libs/editor/' changes from 571b0b7..aec6410 fecaf30 Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor aec6410 remove libs/utils dependency (use the artifact instead) 5cac05f add getters for Title/Content 406a9d4 move activities from editor/libs to editor/example 4b80ec9 rename EditorFragmentInterface to EditorFragmentAbstract 4b1beca use EditorFragmentInterface and call initContentEditor 30ce072 Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds 9cce529 remove extraneous static field 26fc5f7 new EditorFragmentInterface d328cf6 Merge branch 'develop' into feature/modularize-editor 0bf5a63 move WPEditText to WordPressUtils and reorganize WordPressUtils ac92a69 move WPEditText to WordPressUtils and reorganize WordPressUtils c11bb96 fix WordPressEditor example build 9fc7eee First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) 20a9dd9 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) 8b3bf17 rename editor/analytics projects in build files e12800b rename editor/editor to editor/WordPressEditor and analytics/analytics to analytics/WordPressAnalytics to avoid confusion in Android Studio f4ba322 Blavatar defaults to 404 9d58f07 Added blavatars to ManageBlogsActivity 6a4e8c7 use utils artifact instead of sub project e451f1f move resources from main project to editor 4917b74 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor 77a78c9 Squashed 'libs/editor/' changes from 86805a0..571b0b7 571b0b7 add license file 48a14b0 add assets link 9dcfa23 Add 'libs/editor-common/' from commit '9d488d2a1c610380aa9446f8c9fea50d15354a84' 9d488d2 initial commit cdcc2a8 Initial commit 3b085ce Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop d9f758e Merge branch 'release/3.7' into develop c24cf7f comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there fa05a48 Add strip=all to all Photon requests 1b5d1fd add dependency on WordPressUtils and use AppLog instead of Log add8d90 Squashed 'libs/editor/' changes from fc65662..86805a0 5df2a9b Squashed 'libs/editor/' changes from fc65662..86805a0 86805a0 Add 'libs/utils/' from commit '94d1dbb0f5220525759de83c60cba3e95ce95eff' cfc3ff0 use title/content params in the editor 9f26eb3 remove useless test in example 83ff559 fix appcompat and support-v4 dependencies 714eeb1 move new editor logic to a fragment 4a2f1ba back to 21.1.1 tools 279f2ee fix appcompat dependency d3985f0 new travis config ee42dda fix build for example project 66fb19b rename package name to org.wordpress.android b61040c rename package name to org.wordpress.android 4edc93f add signing to publish artifact fc65662 first commit 22fc5ea fix #2293: remove leading double slash in URLs returned by wporg servers 21a72fe Merge branch 'release/3.7' into develop 5fc20b0 fix AppLogViewerActivity when a log is message is null 519a49d Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title fe5748a new BlogUtils.getHostNameFromAccountMap function 6086bf3 Theme live preview no longer changes the activity title f5425b4 Photo viewer now uses low quality for the lo-res image 2765036 Simplified comments e8555a5 Switched to quality enum which defaults to medium 455855b Added default quality param to photon f0fa639 html encode log entries in AppLog.toHtml() a844a15 fix #103: retain menu drawer scroll position after switching activities 5a72a14 Merge branch 'develop' into issue/985-make-sfactory-private 847dc52 fix build files for android studio 1.0 3b3a115 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 855bf77 update support lib version for travis 04c0532 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 6e2fc97 Merge branch 'develop' into release/3.4 c8ae9b8 remove unused code (refresh button) 47b079d fix #985: maks sFactory private - force injection in test module e6eb6dc Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java 411df80 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 16e27f7 Removed unsuccessful fix for #1982. 57dc2d6 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity cc8d417 Merge branch 'develop' into feature/material-appcompat 7078615 Merge branch 'release/3.4' into develop 376d5d8 Merge branch 'hotfix/3.3.1' into release/3.4 2131975 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 5c7d9c1 update subtrees to use build tools 21.1.1 2eaaf77 rename PullToRefresh to SwipeToRefresh 8191caf remove unused viewClass in PTR constructor cc60d09 fix circle spinner color style 5a2533c Return a copy of the JSONObject in getDiffableValue(). 2bff0f2 replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 039d47e Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting a3ef9c1 Merge branch 'develop' into issue/1958-round-avatars ebdc699 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting c03a923 Merge branch 'hotfix/3.3.1' into release/3.4 e71569b upgrade to android-gradle 0.14.0 a8aa7e5 Rounds all WPNetworkImageViews with `AVATAR` type. 6e90b83 Initial commit adding mentions to notification comments d4ff1cf Added image spans directly instead of using Html.fromHtml(). afc5a86 Merge branch 'release/3.2' into develop 8b95174 fix debug/release build propagation to sub projects 1b079d0 Merge branch 'release/3.2' into develop e481b13 Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign dcc33ea Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet f438748 Merge branch 'hotfix/3.1.2' into release/3.2 a061eb3 fix #1821: remove DisplayUtis.isTablet() method 70242e2 Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null 012532e Merge branch 'release/3.2' into feature/notifications-redesign 7339f98 Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 70fd076 Merge branch 'release/3.2' into develop 907b86c Merge branch 'hotfix/3.1.1' into release/3.2 22532e4 Merge branch 'hotfix/3.1.1' into develop f2d990a remove isTablet() check c54c2be Merge branch 'release/3.2' into feature/notifications-redesign dde165c Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" de7cb04 Merge branch 'develop' into feature/notifications-redesign 60a3cf7 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance 36ce907 fix lint error in utils b7c1140 Merge branch 'develop' into feature/notifications-redesign 2e0d872 Removed aggressive `JSONUtil` logging e5ee549 update support-v13 library to version 19.1.0 c71fdf7 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images 2167d48 disable refresh on the attacher 811be6a use the PTR library version 0.9.7 b59d7a8 set network refresh mode as default 3294c34 remove unused code 4344929 add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled 5a6e5cf move NetworkUtils to WPUtils subtree 0277c58 Updated comment 719a637 TextView content is reset to itself to force it to correctly resize using cached image c8b1eaa More cleanup 8e366fa Cleanup WPImageGetter based on code analysis f0229fc Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel 8b37df5 Merge branch 'release/3.1' into develop 92677c2 Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1 ca27479 fix #1762: show blog url in the share blog spinner if the blog title is an empty string b2d1806 remove ProfilingUtils.getVersionName calls 2b0241f remove unused method from ProfilingUtils f464cdb move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods 643365e Merge branch 'develop' into feature/notifications-redesign 10253e0 Rewrote the AppLog viewer to use a ListView+adapter 631fbe9 Merge branch 'develop' into issue/1690-track-last-seen-screen 525e3c3 remove unused util file ActivityUtils efdb85c Merge branch 'develop' into issue/1684-stuck-notifications 8b2a504 Bump libs/utils version number. bbbe7d8 Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size adbedc9 generic way to track last seen activity - requires GET_TASKS permission 8deae86 Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. a38b30c Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. 41078f6 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update 2346771 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user. f00f6b5 Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash 02f662f init utils readme 4d7191e import libs/utis b42ec5a fix #1681: null check 900e14c Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column 32266a5 Merge branch 'Develop' into 'notifications-redesign' git-subtree-dir: libs/utils git-subtree-split: c2484a2
maxme
added a commit
that referenced
this pull request
Aug 26, 2016
7932116 Merge pull request #448 from wordpress-mobile/issue/onConfigurationChanged-lint-error 6b58ec7 Update travis configuration c1aedf6 call super onConfigurationChanged in ImageSettingsDialogFragment f7cfaaa update gradle wrapper 17596a9 Update com.android.tools.build:gradle to 2.1.3 7c58485 Merge pull request #4421 from wordpress-mobile/update-dependencies 628a827 Adds a null check 4049834 Don't allow dropping web URLs 9eb9f06 Updating libraries to use correct/latest Utils 98ddad8 Updating the support library for all projects fc899c1 Updating to build tools 24.0.1 dd77c0b Do allow dropping text while in HTML mode 88f3936 Disallow dropping images while in HTML mode 6b15049 Denote disallowed drop was indeed handled 4134df7 Toast the user about dropping images in Title f2d6536 Revert "Padding instead of margins in editor editables" 5a2ec16 Support for dropping multiple images d9cd10f Acquire permissions needed by the DragEvent 23df6de Padding instead of margins in editor editables aba2bf7 Don't allow dropping images into the editor title b2fb955 Use wp.loadText to reformat dropped text f3eb205 Visually format the dropped text before inserting 8a4d420 Minor code re-org e135ff0 Escape dropped text before inserting 65327ac Ensure initial paragraph tag on dropping text 687a261 Null check for dropped text 95f343a Handle text dropping directly in onDragListener 757a678 Fix: plain text drop uses a different getter 42a78b7 Support dropping PNGs 614dd2a Support for dropping text into the editor 347850d Move input caret while dragging 236aa2a Merge branch 'develop' into feature/drag-drop-editor 6ba9b0b Merge commit '8c64473541f2199f74480f309d2821c8018c79a1' into sync-editor-1.3 6729ac1 Merge branch 'hotfix/5.5.1' into release/5.6 2e60a4d rollback 23.4.0 versions of support libs in the editor 38c49d9 First stab at enabling drag-and-drop in editor 1fab16f Merge commit 'afb0de7a32b95bd121066088dc795f8a6e98909c' into hotfix/5.5.1 c137028 Merge commit 'ced263752a32fb381556cee59b6a2031f5b4f380' into hotfix/5.5.1 8a5cf08 Remove unused strings from the editor and merge them with the main strings.xml file for i18n 886f371 Merge branch 'release/5.5' into develop e70d63e Merge commit 'd0d8dd46c2b8223d66ec3e80578788d1b6cd8b85' into release/5.5 f486891 Merge branch 'develop' into issue/3924-method-count 18a441c Merge branch 'release/5.5' into develop 4153312 Merge commit '49ac39827552c17c8d5b65eca236a55961cf6814' into release/5.5 ca22492 Merge commit '1cf141b3362c5c44f27a8b65775d3db27ac5756a' into release/5.5 4e5aad1 Merge branch 'release/5.5' into develop a72f520 Merge commit '65eec31755233d054ff01bf729eea6d233f6d7df' into release/5.5 e3238bd Merge commit '2fc5d53d4ba45ed45c806a5ac0772458a4ef403e' into release/5.5 d1344dc update compileSdkVersion and buildToolsVersion in every subtrees 5faeba1 update gradle wrapper to 2.14 6223168 Merge pull request #4209 from wordpress-mobile/issue/add-passcodelock-switch f1b5457 onFeaturedImageChanged signature changed: long instead of int b7c9852 Merge branch 'hotfix/5.4.2' into release/5.5 1a4cd80 Merge commit '19320ef6206ed7104072d5a2f7fb7896c8e84596' into release/5.5 01d4f6b Use a long for featured image IDs b3b5d0f Updating gradle plugin to 2.1.2 db7ff96 Merge branch 'hotfix/5.4.1' into release/5.5 8a9cc5e Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1 f8ad252 Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size fd891ba Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1 c98fb04 Merge branch 'hotfix/5.4.1' into issue/4147-translated-original-size cb5a1c6 fix an issue with initial max width value in legacy image settings a334c40 Update to latest utils version 82cc1b8 use MediaUtils.getImageWidthSettingFromString instead of referring to 'Original Size' 7840c5c Merge pull request #4161 from wordpress-mobile/issue/391editor-fix-legacy-image-settings 7f63f40 Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 0a2287a associate the mediafile with newly created image span d150911 Don't attempt to remove image selection formatting if the image is no longer attached to the document 55930ce On API 19 and below, don't set focus on the container when showing the edit overlay 50129ac When applying the edit image overlay, give focus to the edit container instead of the image c70d784 Merge branch 'release/5.4' into release/5.5 7151f8e check for null parameters in createWPEditImageSpanRemote 0d59484 fix #4137: check if context and media file is null c8b44ca Merge branch 'release/5.4' into develop fd0cfb9 Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 5b0678c Merge branch 'release/5.4' into develop b404d5b Block media button if action in progress 212dc2f fix editor tests 67eafc7 Don't allow publishing if insert image or insert video action in progress 707c603 fix wordpress-mobile/WordPress-Editor-Android#294: Block HTML mode until insert image or video has finished 7942521 Merge pull request #4121 from wordpress-mobile/issue/294editor-block-switch-to-html-mode-until-insert-image-finished 41adb14 Merge branch 'release/5.4' into develop 8f77d52 Block media button if action in progress d35ddac bump minSdkVersion from 14 to 16 c026ad6 remove specific code for API < 16 in editor 25375d3 fix editor tests 10e48c6 Don't allow publishing if insert image or insert video action in progress 9499392 fix wordpress-mobile/WordPress-Editor-Android#294: Block HTML mode until insert image or video has finished 5f37dee chmod 644 image files 635b3fb Merge commit '3418d3e2da66bf5ecc19b5e073794c866711e776' into develop 53b29cc Merge pull request #3856 from wordpress-mobile/issue/3791-support-library-23.2 a981088 Updating to support library 23.4.0 2503fbd Merge branch 'develop' into issue/3791-support-library-23.2 f0bed16 Improved error message displayed when failing to load visual editor HTML 3ece15d Merge branch 'develop' into feature/magic-link 729d0cc Merge commit '3b37573c3bef0da83e7c0991c3ddd7069ea34947' into develop 0b8a733 Merge commit '4542685e8fcd0e490279dde87f9ac3d8887bc0af' into develop f4ff5de Merge branch 'develop' into feature/magic-link c099353 Merge pull request #4024 from wordpress-mobile/feature/update-gradle-plugin 46213c2 Merge commit '99075045579437eb0928d9fb5b363cf5d1774870' into develop 365c870 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 a2aa8be Merge branch 'develop' into feature/magic-link 9474d20 Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop d22e4c1 Merge branch 'develop' into feature/magic-link bd19b42 Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure b4be6f1 Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image 5f71918 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop 1da6d97 Use a static listener to handle reflection failures 9eca57e Merge branch 'develop' into feature/magic-link d72224e Updates the p/div conversion regex to more strictly match tags 9cb2d66 Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread 5221b23 Merge branch 'develop' into feature/magic-link 0c31d62 Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop 37fca47 Adding MissingPrefix ignore rule to Editor as well fe21a2b Merge branch 'develop' into issue/3791-support-library-23.2 5b27ae2 Button is no longer screen width and extracting string resource a41b87b Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update e640f54 Merge branch 'develop' into issue/editor-p-to-div-update f645729 Merge pull request #3931 from wordpress-mobile/issue/fix-placeholder-title-in-french 6c7167d Merge commit 'd2f7ed4e05fa13e80fbe573f043fac43baf5e0b1' into issue/editor-p-to-div-update ad999ba Updating to gradle 2.0 a5f0ab7 Updating support library to 23.3.0 f272c89 Updating to gradle 2.0 2f39640 Merge branch 'develop' into issue/3791-support-library-23.2 e15976b Updating to rc3 2543f5d Escape quotes on translated strings when calling execJavaScriptFromString dc35a09 Merge commit 'c5b98a88c01551e8dbf44366072607d364ec01dd' into develop 5b33866 Updating build.gradle to latest rc3 8c52162 Merge branch 'develop' into issue/3791-support-library-23.2 eacf107 Merge pull request #3919 from wordpress-mobile/issue/update-build-tools ef47ca9 Merge branch 'release/5.2' into release/5.3 096965f Updating the rest of the modules to buildToolsVersion 23.0.3 7255db3 Updating the rest of the modules to buildToolsVersion 23.0.3 9d0aa62 Merge branch 'develop' into issue/3791-support-library-23.2 738665c Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 6ba1837 Add missing classes for images inserted from media library - also fix a bug with undefined alt text 82dc58c Add missing attributes for uploaded images f752e83 update to android-gradle-2.0.0-rc1 7fe2fc9 upgrade to gradle plugin 2.0.0-beta7 921854c Merge commit 'c6efe0a9190244d40e64300efc9cca56ae5acd5c' into develop e3b86d7 Merge branch 'develop' into issue/120editor-initial-focus 25c5d52 Merge commit '9b0b5fab24db9f435b278ad0b9e77d5895135700' into develop 722e4e3 Merge pull request #3897 from wordpress-mobile/issue/260editor-clear-failed-images-on-upload ffe3c61 Null check getParentRangeOfFocusedNode/setRange in onMutationObserved - in case editor is not in focus c3e0ae6 Show the software keyboard once the DOM has loaded 4834f1d Focus on the title field when opening posts f4a78fb New EditorFragment method to removeAllFailedMediaUploads() ae29ad5 New JS function ZSSEditor.removeAllFailedMediaUploads 1fa7a5d Merge pull request #3896 from wordpress-mobile/issue/300editor-broken-images-after-upload-2 9155094 remove debug logs 65838e8 Use remoteurl in the link wrapper 805af54 Converting all android:src to app:srcCompat to handle VectorDrawables 2b60eba Changing all Activity classes to AppCompatActivity to handle vector drawables a5cace9 Merge branch 'develop' into issue/3791-support-library-23.2 80576a8 Merge branch 'develop' into issue/300editor-broken-images-after-upload-2 f3c2293 Merge branch 'develop' into issue/297editor-backspace-media 9593d8b Merge branch 'develop' into issue/3791-support-library-23.2 ac05d57 update to com.android.tools.build:gradle:2.0.0-beta7 369764a Updating support library to 23.2.1 b542c20 Merge branch 'develop' into issue/297editor-backspace-media fa99288 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 7bd6e58 Changed MutationObserver handling to check if the WebView supports it, rather than rely on API levels 96e1c24 Refactor: grouped mutation observation methods together c603ab4 Refactored DOM element mutation listening, delegating everything to one trackNodeForMutation method 095cb82 Changed MutationObserver behavior to track individual media nodes instead of each contenteditable div a0eba3d Moved failed media methods to the generic media method group f93397d Parse for failed media when returning from HTML to visual mode e956fc4 Track DOMNodeRemoved events when parsing for failed media 6e2c384 Fixed a variable name error in ZSSEditor.removeImage ece9989 On API<19, use DOMNodeRemoved events to track media deletions (instead of the unsupported MutationObserver used for newer APIs) 7385103 Merge branch 'develop' into issue/297editor-backspace-media 5c92b29 Merge pull request #3804 from wordpress-mobile/issue/enable-editor-debug-mode 711b0ca Consume KEYCODE_VOLUME_UP event when debug print is called abfd08e Merge commit 'a299686f47294c20ef04e818585f1d27cf069876' into develop 619e0ad broken retries 9323bbe Merge branch 'issue/enable-editor-debug-mode' into issue/300editor-broken-images-after-upload-2 dd0643f use a remoteUrl attribute to avoid seeing broken image if download failed d4cf929 remove debug action bar button and log raw html when volume up button is pressed 4b6f10f fix function call errors b9444d8 Add back image swapping onError e9ae1aa Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 2a884cf fix wordpress-mobile/WordPress-Editor-Android#300: Retry download onError after an upload 74c0aaf add missing comment a03811b Updated gradle to 2.0.0-beta6 ea572e6 Fixes an issue where manually deleting uploading/failed media will cause the caret to disappear b90e964 Notify native through a callback whenever uploading/failed media are manually deleted 77d406e catch a common JS exception 5df7cc7 Merge branch 'develop' into issue/288editor-log-js-errors-in-crashlytics 65a9f38 fix wordpress-mobile/WordPress-Editor-Android#288: new EditorWebViewAbstract.ErrorListener used to forward JS errors to Crashlytics 833c9eb Keep the format bar disabled on rotation when the title field is in focus fc0d7dc Rely on ZSSEditor to flag uploads as completed in native-side checks ef5c345 Added null checking for MediaType onMediaUploadFailed 548761e Wait until the ZSSEditor has replaced the local media with remote before marking it as completed fdd35d2 Strip any trailing when returning the title 1669621 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 8169007 Editor 0.6 version bump c3eb7a1 Updated localized string calls in ZSSEditor video methods 0394937 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 0922237 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor ad3a3d3 Escape quotes for URLs being passed to the JS editor 0557baa Use hasAttribute to null-check when parsing for failed media items fb747c5 Wrapped called to getThumbnailURL in notNullStr() in the editor fragment 73c92bb Removed unnecessary console.logs cbd283b Drop data-failed attribute from ZSSEditor.insertLocalVideo 26edba2 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 4a14104 escape single quotes when calling execJavaScriptFromString c0deade Use API<19 compatibility upload UI for video (imported from images) 90f682a Include videos in count of failed media uploads cab0967 Mark uploading videos as failed when opening a post containing them, so they can be retried 4402006 Send VideoPress shortcode and poster URL to visual editor when video upload completes 6ba9482 Stop adding unnecessary 'data-wpid' attributed to completed video uploads de44320 fix wordpress-mobile/WordPress-Editor-Android#285: markImage(Video)UploadFailed now called with 2 parameters 243ab51 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 73ec713 Merge branch 'develop' into feature/visual-editor 6914fa4 Upgrade gradle plugin to 2.0.0-beta5 2df9685 Update gradle version in wrapper 4174b5d fix MockEditorActivity for tests bae8be3 Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes a939bf1 Centralized tracking of added images/videos 093f551 Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes b3d04f7 Merge branch 'develop' into feature/visual-editor 09dad0a Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 ed5311f update to android gradle plugin beta4 f114c55 update to android gradle plugin 2.0.0-beta-2 - Instant Run 1a6e023 Updating to latest versions of internal dependencies 5ab9fda Keeping internal dependencies always pointing to the latest version c8c18aa Merge commit 'c0c935fa4b3b6135be8099b637da57bede6b850f' into feature/visual-editor 906b9f4 Hide video fullscreen button ee649cf Pause video playback when the WebView is no longer visible to the user 327b1e3 Use a blank placeholder src instead of videopress.mp4 to trigger videopress video loading 02b5dff Added some sanity checks for substring usage to JsCallbackReceiver 661aef5 Fixed a bug where videos would sometimes get deleted if they were the only thing in the post 865b3d0 Added support for video shortcodes on non-VideoPress sites a895d60 Merge branch 'feature/visual-editor' into feature/editor-video-playback 7ac20f8 Added missing bracket in JS editor 0442aed Follow redirects when requesting thumbnails for the image settings dialog ceb500b Always defer to super.shouldInterceptRequest in editor WebView unless an auth header is present d82e4a9 Merge branch 'feature/visual-editor' into feature/editor-video-playback 4beed68 When looking up a VideoPress ID in the DB fails, refresh the blog media and check again 35fed76 Remove the onError attribute from VideoPress videos if an empty video url is returned 4af2960 Added the ability to tap a placeholder VideoPress video to attempt to load it 5c43e8d Don't use the placeholder poster image for videopress videos 3cda722 Add space after videos when converting from VideoPress shortcode f4c2e85 Only apply custom headers for network URL resource requests 3b94949 Implement new EditorFragmentListener method in mock activity for integration tests 49e014f Convert VideoPress shortcodes to video elements and back in the visual editor 749403b Imported ZSSRichTextEditor video methods and callback methods from iOS d411273 Imported video CSS from iOS fe99f03 Added missing method implementation to test mock activity 668c4f6 Retrieve an auth header if necessary when launching the image settings dialog dbc0418 Use the safeToAddWordPressComAuthHeader utility method for resource requests in the new editor's WebView 41dcd76 Updated the utils artifact version for the editor b616eb3 Moved setupUrlConnection() to the utils library 162e8e6 Renamed EditorFragment's setWebViewHeader to setCustomHttpHeader 82c14c2 Use custom headers for image settings dialog image requests cc018e2 Extracted some duplicated HttpURLConnection building code into a utility method 3689291 When an Authorization HTTP header is detected, force using the HTTPS protocol in the WebViewClient 9d7cb78 Added support for custom headers to the editor's WebView, set through the EditorFragmentAbstract caedd9b Editor 0.5 version bump 979e397 Added full support for gallery types b8f0c81 Added a fix enabling galleries to be added to the editor before the DOM loads ce73ca2 Fixed creating a new post by making a gallery from the Media Library (the gallery wasn't being added to the new post) 84b7c81 Merge branch 'feature/visual-editor' into feature/editor-galleries 4874732 Merge branch 'feature/visual-editor' into feature/editor-sync-0.5 7a2a9d8 Merge branch 'develop' into feature/visual-editor 73dbba9 Merge branch 'develop' into feature/editor-sync-0.5 5ad3103 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 8afa221 Added support for creating galleries from local images, using a placeholder shortcode while uploading fd5141c Extracted duplicate paragraph-wrapping code into a separate method in the ZSS editor 04986d6 Added support for inserting galleries using media library images 409b5d9 Merge branch 'feature/visual-editor' into feature/editor-featured-images e90a474 Merge branch 'develop' into feature/visual-editor fe047ba Removed unused 'Include image in post content' checkbox from image settings 2577013 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects ee69781 Use a callback instead of a getter to notify the host activity when the featured image changes 17695af Add the remote media id to image tags when inserting from media gallery e3cdc3c Hide the featured image checkbox if feature images aren't supported 6e410c9 Updated Editor example project with changes to onMediaUploadProgress 5f7cbc3 Fixed a crash issue in the image settings dialog fragment 6ac416c Converted featured id handling methods to be part of EditorFragmentAbstract 4a9d2dc Added support for getting and setting the featured image id to the editor fragments c1cb3fb Don't clear all class data in ZSSEditor.markImageUploadDone 8ec7e95 Add the remote image ID to the image tag when an image upload completes eff15be Added support for setting/unsetting an image as featured to the image settings dialog 607feca Modified onMediaTapped to pass the image meta data as a JSONObject b4cf8ca Fixed a broken test and an issue with the editor demo activity aa69c47 Implemented missing method in EditorFragmentAbstractTest bada788 Added some empty string checking when retrieving failed media ids from the ZSSEditor ab9c7a0 Adjusted the pattern used by the ZSSEditor to find images that are uploading 931052b Disable editor format bar buttons when post/page contains failed uploads 33b6921 Updated EditorFragment to handle exiting the editor with media uploads in progress more gracefully 80c282e Added a 'delete' flag to onMediaUploadCancelClicked 8759b61 Fixed a bug where the media upload progress bar wouldn't display due to a localization issue 8078247 Visual editor lib version bump 4675c84 Updated image settings dialog to always clear the custom ActionBar view 04cabe7 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 4620b05 Updating build tools to 23.0.1 f2fcbf3 Merge branch 'release/4.4' into develop 1365ff9 use default AppCompat theme on EditLink and AddCategory dialog 365d32c set targetSdkVersion to 23 and clean up lib dependencies d7f3655 migrate from mavenCentral to jcenter (which is now the default for Android Studio) 49cb22c upgrade subtrees to latest android tools 9faf049 update to gradle plugin 1.3.1 and gradle 2.6 a236689 Merge branch 'develop' into feature/update-to-gradle-2.4 72f97b9 upgrade to gradle 2.5 and gradle plugin 1.3.0 f7c4ca3 Merge branch 'develop' into feature/update-to-gradle-2.4 ce1cb7f Merge branch 'develop' into feature/update-to-gradle-2.4 61dd677 Merge commit '33111c4b44646d8be75a874bbea053d1fb046f98' into merge-visual-editor 2538253 Merge commit 'f9336b16d6ee89fdb83f26786ceecbcd6147b5fa' into merge-visual-editor 9896ee0 Merge commit '5f30f5370258c76caec14054688312c66aadd7cf' into develop 9f79a47 Merge commit '56693c52342639687b09982e69b92b0f9f988475' into develop caba147 Merge commit 'df5f63473447582437fa7019684080b1ae47a39d' into feature/editor-activity-fixes c55ea47 Merge commit '9eaf95842954e90dbb01618e932ce1560ba1f5f6' into update-editor-library 406f150 Updated support library and build tools 01000cd update to gradle android plugin 1.2.3 04e62d3 update support lib to 22 67eef376 update to android-gradle plugin 1.1.3 and build tools 22.0.1 d5790ec move addPictureButton action to LegacyEditorFragment 1ae344a Merge pull request #2637 from wordpress-mobile/issue/2635-npe-legacyeditor-onactivityresult 51bf367 fix #2635: check if data is null 56d93ce Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop 2ad75f2 update to wputils 1.6.0 d8ee144 Update wpeditor 5249318 Use a placeholder image when thumbnail can't be decoded ba1df21 Removing potential race condition with WP image loading threads. 9092121 WP library images and local images working. 2a80bbc Local images are maintained after fragment is re-created. 0b6a5b8 Returning to the post editor won't crash if Activity was destroyed. fc367ba Fix #2406 - Load media file in the background 808427c fix gallery placeholder icon 2a3fba5 Tapping a media gallery span opens gallery editor. 2f20e48 Adding missing override annotation. a41c33e Using isVideo to determine if a file is a video. e9100ea enable gallery handling cf70efb remove unused code ee91f79 first step at introducing the new media picker e80442d rename and update editor colors adc2819 Merge branch 'develop' into feature/modularize-editor 468129f fix local draft style saving by introducing an awful "getSpannedContent()" method :( a18e293 EditLinkActivity is now independent from the EditPostActivity 9982612 add local draft / remote post example bec8371 make the legacy editor works in the example project 87257aa LegacyEditorFragment now lives in the editor subproject 4c18e6a split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 9909907 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils eaa41f0 use setFeaturedImageSupported instead of using WordPress.getCurrentBlog().isFeaturedImageCapable() 3fc876b appendMediaFile now able to load local media a299756 reenable appendMedia in LegacyEditorFragment f6df495 split methods to be usable on MediaFile instead of WPImageSpan e3e82b1 move WPEditImageSpan bitmap loading to the constructor a7d7750 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 74f33a8 first step to remove getContentEditText/getTitleEditText git-subtree-dir: libs/editor git-subtree-split: 793211609b7e2d63d416ac1ec0a4bacc26f5309f
maxme
added a commit
that referenced
this pull request
Sep 9, 2016
e2fca68 Merge pull request #6 from wordpress-mobile/feature/publish-to-bintray ff55402 Merge pull request #9 from wordpress-mobile/issue/default-value-types 54e9c48 Converting type of default value for float/double map getters 62c3515 Merge pull request #7 from wordpress-mobile/issue/add-new-maputils-methods 2892e26 New MapUtils.getMapDouble/getMapFloat methods c2f2939 fix minor JavaDocs issue that was breaking the build 2573319 Use bintray plugin to publish the maven artifact 0c54828 Update the README with bintray infos 65eff6d remove unused gradle config 8b2c1d1 Update gradle wrapper acc6a07 bump version to 1.11.0 8c24405 Merge commit '937086d17b266a17ea6bdd144656cd5282fa86d7' into issue/4235-locale-getdefault-usage 3deb502 changed Locale.getDefault() occurrences for the slightly enhanced LanguageUtils.getCurrentDeviceLanguage() 4643408 moved LanguageUtils to Utils. + split getDeviceLanguage into Code (for string) and Locale for reuse as suggested in code review by @maxme 788b981 Merge branch 'release/5.5' into develop 40f8845 Merge commit '49ac39827552c17c8d5b65eca236a55961cf6814' into release/5.5 49ac398 Squashed 'libs/editor/' changes from b012dc8..a2a6a7c 77a5220 Merge commit '1cf141b3362c5c44f27a8b65775d3db27ac5756a' into release/5.5 1cf141b Squashed 'libs/editor/' changes from c5f3e9c..b012dc8 d862a72 Merge commit '65eec31755233d054ff01bf729eea6d233f6d7df' into release/5.5 65eec31 Squashed 'libs/editor/' changes from 5ee37c8..c5f3e9c 3de1e7f Merge commit '2fc5d53d4ba45ed45c806a5ac0772458a4ef403e' into release/5.5 2fc5d53 Squashed 'libs/editor/' changes from b207f3f..5ee37c8 5a93f9e update gradle wrapper to 2.14 612eb5d Merge branch 'release/5.5' into develop 0942d02 Merge commit '19320ef6206ed7104072d5a2f7fb7896c8e84596' into release/5.5 19320ef Squashed 'libs/editor/' changes from 68d15ed..b207f3f 9accdee Updating gradle plugin to 2.1.2 aea69b5 Merge branch 'hotfix/5.4.1' into release/5.5 0e7e33b Squashed 'libs/editor/' changes from 2c183ac..68d15ed 564fe01 Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1 38919d3 Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size e8a087f Squashed 'libs/editor/' changes from 10ae495..2c183ac d196e58 Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1 70fbe99 new MediaUtils function: getImageWidthSettingFromString 1ff8fe9 Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 be0d5e7 Merge branch 'release/5.4' into develop eac2ab2 Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 41c54a9 Merge pull request #4100 from wordpress-mobile/feature/people-management-sync 1c2428f Merge branch 'release/5.4' into develop 83b8a3b Merge remote-tracking branch 'origin/develop' into feature/people-management-sync e9f2263 Clarify comments and parameter names b75040c fix #4114: remove the URL scheme if it's not http or https during URL sanitization f5cf254 Updating to support library 23.4.0 09d627d Merge branch 'develop' into issue/3791-support-library-23.2 83b2a08 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 4b19685 Merge branch 'develop' into feature/gravatar-upload-okhttp f686595 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync a064704 Merge commit '3b37573c3bef0da83e7c0991c3ddd7069ea34947' into develop 6bd0eaf Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 f636a7d Adds permission utils for calling via fragments 55969ba Merge remote-tracking branch 'origin/develop' into feature/people-management-sync dbb3be7 Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop a06b5d7 Merge branch 'develop' into issue/3791-support-library-23.2 56aabff Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 7d37c22 Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update d4387b4 Updating to gradle 2.0 282d7b8 Updating support library to 23.3.0 ae9db13 Updating to gradle 2.0 6adaaa7 Merge branch 'develop' into issue/3791-support-library-23.2 061f32b Updating to rc3 2f39af5 Updating build.gradle to latest rc3 55d7dd9 Merge branch 'develop' into issue/3791-support-library-23.2 b63d875 Merge pull request #3919 from wordpress-mobile/issue/update-build-tools dc2c5f8 Merge branch 'feature/people-management-sync' into feature/people-management-network-and-data-layer ee21584 Merge branch 'release/5.2' into release/5.3 44f5192 Updating the rest of the modules to buildToolsVersion 23.0.3 f5ade45 Updating the rest of the modules to buildToolsVersion 23.0.3 c969743 Merge branch 'develop' into issue/3791-support-library-23.2 8772a5c Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 50153d8 Added People to AppLog 9e8f3ce update to android-gradle-2.0.0-rc1 549a3cd upgrade to gradle plugin 2.0.0-beta7 422a249 Merge branch 'develop' into issue/3791-support-library-23.2 52b7374 update to com.android.tools.build:gradle:2.0.0-beta7 2954409 Updating support library to 23.2.1 018afc3 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop d9c3df6 Comment getQuantityString() 3d0451b use String.format(getString(format), ...) instead of buggy getString(format, ...) 711d189 replace plurals with a utility method b319ace Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 521be50 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 348956c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master c3e7e81 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 79220be Mark the util WPEditText as deprecated 88508bb Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master d2d5ae1 Updated gradle to 2.0.0-beta6 767a589 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 299607b Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 23ef582 Merge branch 'develop' into feature/visual-editor 013443b Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9abb331 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor 9f8be1a Merge branch 'develop' into feature/visual-editor 221b07e Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager 6fde017 Merge remote-tracking branch 'origin/develop' into feature/account-settings d54772e Upgrade gradle plugin to 2.0.0-beta5 066e9be Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes b7c87e7 Merge remote-tracking branch 'origin/develop' into feature/account-settings 19ea3e0 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 69166a4 Fix media isVideo/isValidImage/... utils method 8ea88b8 Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 62db2a7 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop 1b7d78d Merge remote-tracking branch 'origin/develop' into feature/account-settings 06fb0e9 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 77532e5 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 653aa3c Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 68eef86 update to android gradle plugin beta4 5ac9ad7 Merge remote-tracking branch 'origin/develop' into feature/account-settings 99b9392 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 914189d Reverts a previous unnecessary change that's accidentally committed for StringUtils 5523639 update to android gradle plugin 2.0.0-beta-2 - Instant Run d941ec1 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment 0918ae5 Use lowercase locale array to make sure language is pre-selected 8ef893e Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it. 0c349cd Merge remote-tracking branch 'origin/develop' into feature/account-settings fd15e5c Download available plans for a site. Refactoring!! 0aa7017 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item fc57d17 Download global plans from wpcom and parse them. Store the response in AppPrefs for now. 6640c35 Primary site added to Account Settings (wip) 8c86c32 Adding SETTINGS log tag and logging unknown language code error 3cb8b41 Merge develop into site-settings-review db57341 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop 135651f Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop 74fdb6d Add utility methods to check if a URL is wpcom. Add utility methods that check if it's safe to add the Authentication token to the request. a0d2721 kill StringUtils.getHost function fe0e9f8 s/getDomainFromUri/getHost/ dbb7f17 4.9-rc-2 / 228 version bump 2f368f6 fix #3521: use the simplest UnderlineSpan subclass d79015f Merge branch 'develop' into feature/site-settings-review 3b883d3 Allow photon to resize GIFs 07ed5f7 Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop b1e3e12 Merge branch 'develop' into feature/site-settings-review d14e1f4 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib fbbc04b fix #3372:Resource Leak in SqlUtils.java e0b7719 Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop 4d56e0c Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop 4932d4c Moved the check for video to within ImageUtils ff66d05 Merge branch 'develop' into feature/site-settings-review c7e27cf suppress lint on missing permission ab2de89 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 7cc55d6 Add log line that could help us in case of errors in the JSON parsing with queryJSON. 05f21a9 Merge branch 'develop' into feature/site-settings-review 311a009 Better solution: Fix the url within PhotonUtils. Hattip @nbradbury 964a877 Revert "Fixes issue where private blog images wouldn't load." e5a7279 Revert "Killing whitespace." 803bf3a Killing whitespace. 9c93172 Fixes issue where private blog images wouldn't load. 57ee5fa Merge branch 'release/4.7' into feature/site-settings-review 84139a9 Moved permission check and request to PermissionUtils 972344d Checking media permission when attempting to add media to post c367ec6 Merge branch 'release/4.6' into issue/3115-runtime-permissions 0a80b8b first step for runtime location request 15aeb9c Merge branch 'develop' into feature/site-settings-review 82f2229 Merge branch 'release/4.6' into develop 5f1a47c Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release 07511b7 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 8f65aa2 test queryJSON calls with null params a9b52ce Check null query string 1735ccb check null source in JSONUtils.queryJSON() 38c680b Merge branch 'develop' into feature/site-settings-review 696c325 update ProfilingUtils usage 83d1764 Merge branch 'develop' into feature/site-settings-review f53bd94 Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string. 9b31cb9 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host. fd8a557 URL Utils test fix 93bef09 Merge branch 'develop' into feature/site-settings-review 0531009 generic approach to add parameters to a URL 167f96d new UrlUtils method: appendPreviewURLParameter 577e025 Updating build tools to 23.0.1 c80f391 Merge branch 'develop' into feature/site-settings-review 67ff0ed set targetSdkVersion to 23 and clean up lib dependencies 11f42bd migrate from mavenCentral to jcenter (which is now the default for Android Studio) e930aaf fix lint errors 345d619 update to gradle plugin 1.3.1 and gradle 2.6 33ee85b upgrade to gradle 2.5 and gradle plugin 1.3.0 cf84479 Merge branch 'develop' into feature/update-to-gradle-2.4 031be0d Merge branch 'develop' into feature/update-to-gradle-2.4 7ab175f Updating ActionBar title. Save button is now Undo. ef87489 Merge branch 'hotfix/4.1.1' into release/4.2 6c9ad36 Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update 067ee28 Updating EditTextUtils.getText method instead of creating new one. 46b092b limit text to 524288 characters which is always < 2Mb with UTF-8 cd371d6 Merge branch 'hotfix/4.1.1' into release/4.2 4f48de6 fix #2855: delete big comments and truncate new inserted comments 753f63d Coding Styles 652e7ac Make sure the context passed to checkConnection is not null 6c6e7ec Updated support library and build tools f0d7560 update to gradle android plugin 1.2.3 ea21634 update support lib to 22 af8d40f update to android-gradle plugin 1.1.3 and build tools 22.0.1 8a2b015 Introduce our version of MarkView 8699590 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted 355bc2f Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop e5f3d80 Fixed notifications fragment for self-hosted 57c7130 Merge branch 'release/4.0' into develop 9f204b8 Removing potential race condition with WP image loading threads. 9ceea72 Returning to the post editor won't crash if Activity was destroyed. 706c116 Add more audio formats 5d17c56 Handle audio files in media browser 938b72e Merge branch 'release/4.0' into develop a402676 Merge branch 'hotfix/3.9.1' into release/4.0 a2216e5 Catching other unknown URL exception. 44baece Making sure Cursor is closed if exception gets thrown. 7bfd5cc Catching unknown URL exceptions. bcbcd93 Merge branch 'release/4.0' into develop eff4251 Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0 528d090 javadocs c2a0733 If string is empty return empty string instead of null bc02585 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 45d2cff javadocs be31cb0 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 8a06188 If string is empty return empty string instead of null 505f893 Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer 1d64906 1.5.0 version bump 3e8fbe8 Merge branch 'develop' into feature/modularize-editor 4d61abb Added support for `WPWebViewClient` to pass the token for image requests. 1e5ffa6 Merge branch 'hotfix/3.8.1' into release/3.9 a7dd249 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation 6927c94 Merge branch 'develop' into feature/modularize-editor 2143ed3 fix #2328: sort blogs with an empty title by their hostname 6a67bb1 Merge branch '1628-mediapicker' into feature/modularize-editor 2902804 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor 025f85e comment CustomSwipeRefreshLayout.onTouchEvent a2ba9b1 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException 41558d8 Merge branch 'develop' into feature/modularize-editor 819ced5 Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state 196a4c8 Merge branch 'develop' into feature/modularize-editor 2df6e21 fix typo in a comment 4815396 delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712 3c8e177 styling update b934d26 Merge branch 'release/3.7' into develop 04599e1 Merge branch 'develop' into feature/modularize-editor 7d2abd5 fix #2336: check for null text entry, replace them with a string d5de3a0 split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 374a7c3 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 8dbc12f Merge branch 'develop' into feature/modularize-editor 6491fa8 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview a243a5f All gravatar requests now default to 404. 7bb6cc0 Added DEFAULT_BLAVATAR constant 2c8ff0b WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter 042bdd3 Moved fixAvatar routine to GravatarUtils bf9834a Added DefaultImage enum to GravatarUtils 6214a8c move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 1907c9d Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor 95e0f25 Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds 590b9a7 remove extraneous static field 00c64b5 Merge branch 'develop' into feature/modularize-editor 3c894b2 move WPEditText to WordPressUtils and reorganize WordPressUtils ed26387 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) 5771cb1 Blavatar defaults to 404 9b2dc33 Added blavatars to ManageBlogsActivity 3aee599 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor 61f137a Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 7f93953 Merge branch 'release/3.7' into develop de4dac8 comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there 8157cf6 Add strip=all to all Photon requests a5a978b Squashed 'libs/editor/' changes from fc65662..86805a0 0a7fd16 fix #2293: remove leading double slash in URLs returned by wporg servers e822225 Merge branch 'release/3.7' into develop 3125851 fix AppLogViewerActivity when a log is message is null b183edf Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 784eb01 new BlogUtils.getHostNameFromAccountMap function 54e9907 Theme live preview no longer changes the activity title 8fa7a7a Photo viewer now uses low quality for the lo-res image d3af87b Simplified comments 85f7ad4 Switched to quality enum which defaults to medium 67f12de Added default quality param to photon 236c584 html encode log entries in AppLog.toHtml() 907b0c8 fix #103: retain menu drawer scroll position after switching activities 3fb040c Merge branch 'develop' into issue/985-make-sfactory-private f4c700b fix build files for android studio 1.0 1ad0a91 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 29ddf31 update support lib version for travis 2624b92 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 4938e39 Merge branch 'develop' into release/3.4 7384a6d remove unused code (refresh button) fe44802 fix #985: maks sFactory private - force injection in test module 7775c4c Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java 2faebf8 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 fedfe7c Removed unsuccessful fix for #1982. ab24be9 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 39b9f14 Merge branch 'develop' into feature/material-appcompat 79574e2 Merge branch 'release/3.4' into develop d914cfa Merge branch 'hotfix/3.3.1' into release/3.4 cecccd7 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 726b20f update subtrees to use build tools 21.1.1 05b8119 rename PullToRefresh to SwipeToRefresh e47800d remove unused viewClass in PTR constructor 1c6ac63 fix circle spinner color style 7967ee3 Return a copy of the JSONObject in getDiffableValue(). 79bcb2d replace Chris Banes' PullToRefresh by the native SwipeToRefresh view c426b17 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting f25c211 Merge branch 'develop' into issue/1958-round-avatars 72e850f Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting f834861 Merge branch 'hotfix/3.3.1' into release/3.4 a3b5efa upgrade to android-gradle 0.14.0 bb00f79 Rounds all WPNetworkImageViews with `AVATAR` type. 7d20666 Initial commit adding mentions to notification comments ea79cfe Added image spans directly instead of using Html.fromHtml(). c269171 Merge branch 'release/3.2' into develop 0901c11 fix debug/release build propagation to sub projects 72894a7 Merge branch 'release/3.2' into develop 222bdf2 Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign f8b8ca5 Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet f4d6b03 Merge branch 'hotfix/3.1.2' into release/3.2 b8616e9 fix #1821: remove DisplayUtis.isTablet() method df8ce2e Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null 708d85e Merge branch 'release/3.2' into feature/notifications-redesign d4c210d Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 0960d4d Merge branch 'release/3.2' into develop 00855de Merge branch 'hotfix/3.1.1' into release/3.2 c2f5ca7 Merge branch 'hotfix/3.1.1' into develop c7db4da remove isTablet() check 64a087a Merge branch 'release/3.2' into feature/notifications-redesign 75978d4 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" 1fb5196 Merge branch 'develop' into feature/notifications-redesign f475df1 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance fef4219 fix lint error in utils 86c16bc Merge branch 'develop' into feature/notifications-redesign fa9e2ac Removed aggressive `JSONUtil` logging 2807d59 update support-v13 library to version 19.1.0 c6667a4 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images ebdfcdc disable refresh on the attacher 899ec31 use the PTR library version 0.9.7 011b64f set network refresh mode as default b349295 remove unused code cce1b59 add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled 4f788e7 move NetworkUtils to WPUtils subtree dbaf452 Updated comment e38d62a TextView content is reset to itself to force it to correctly resize using cached image 9da1cdc More cleanup a3efebd Cleanup WPImageGetter based on code analysis 29d8ef6 Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel f5b74aa Merge branch 'release/3.1' into develop 121f95d Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1 ddc94da fix #1762: show blog url in the share blog spinner if the blog title is an empty string 68b1735 remove ProfilingUtils.getVersionName calls 92656a0 remove unused method from ProfilingUtils b9ad8f8 move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods ef7d002 Merge branch 'develop' into feature/notifications-redesign b28a856 Rewrote the AppLog viewer to use a ListView+adapter 6ae62a6 Merge branch 'develop' into issue/1690-track-last-seen-screen 7b7f0d2 remove unused util file ActivityUtils d1b9bef Merge branch 'develop' into issue/1684-stuck-notifications 3e3d431 Bump libs/utils version number. fafc0c0 Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size 9dcd95a generic way to track last seen activity - requires GET_TASKS permission 914a978 Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. 19d4c24 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. 4c94d23 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update e12ff64 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user. d74bc38 Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash 35732c4 init utils readme d63c188 import libs/utis 6dcf01d fix #1681: null check 6c2a946 Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column 063b50c Merge branch 'Develop' into 'notifications-redesign' git-subtree-dir: libs/utils git-subtree-split: e2fca68
maxme
added a commit
that referenced
this pull request
Feb 7, 2017
5503849 Merge pull request #4627 from andrew659/develop 6fcfadb use SqlUtils.closeCursor() to close db cursors f3200df Move common code into methods. da0bda0 Remove extra whitespace. 4391682 Print additional info in the log stream when `android_models.properties` is missing or in the wrong form. Also added a reference to the current version used in wp-android. 023ee88 Do not hardcode "WordPress Android" in the header of the log. 8c0fe91 Merge pull request #4678 from wordpress-mobile/issue/update-gradle-2.2.2 18bb900 Merge pull request #4672 from wordpress-mobile/feature/reader-full-post-refresh-master afe1389 Updated to gradle v2.2.2 b105bf5 Add a few safety checks to prevent NRE + refactoring c8d6850 Replace Vectors with ArrayLists 4419c47 Add "ago" to timespan 3f16cda Update to Android Gradle Plugin 2.2.1 a528b64 Close the database cursor in MediaUtils 8e436bd Updating support library to 24.2.1 2340438 Updating gradle version to 2.2 for Android Studio 2.2 1cdfc80 Merge branch 'release/5.8' into release/5.9 85b4304 Merge commit '63de2e5270d210cbb5c24d02f4727302c806b20c' into issue/update-to-wputils-1.14 cf6f240 Merge commit 'a2e3dcec42f1bfa020de253008d3a13966437742' into develop 5030939 Merge commit '220cac4d1bc9ce6397d7d68f6d493bd307622cac' into issue/fix-imagesettings-alignment-issue 220cac4 Squashed 'libs/editor/' changes from 7932116..087a5b2 83de3e8 update travis config and bump build tools to 24.0.2 97f8f70 Merge commit '8730fb59ec9d075e9d009c56d0c7465a96daaf33' into release/5.8 8730fb5 Squashed 'libs/editor/' changes from eb069ba..7932116 f9b60fb Update com.android.tools.build:gradle to 2.1.3 90b8345 Updating the support library for all projects 2e0cb0d Targetting version 24 5f3e079 Updating to build tools 24.0.1 b760474 Modified `getRoundedEdgeBitmap()` to allow for no border a6eb47a Merge branch 'release/5.6' into develop 8c64473 Squashed 'libs/editor/' changes from 7dcc1a9..eb069ba 78d2840 Merge commit '8c64473541f2199f74480f309d2821c8018c79a1' into sync-editor-1.3 9712927 Merge branch 'release/5.6' into develop 247e944 Merge branch 'hotfix/5.5.1' into release/5.6 e9d10d4 Updated legacy editor to place captions the same way as the web editor and visual editor (before the [/caption] closing tag) afb0de7 Squashed 'libs/editor/' changes from 260a0d5..7dcc1a9 5d688bd Merge commit 'afb0de7a32b95bd121066088dc795f8a6e98909c' into hotfix/5.5.1 3278019 Remove URL fragment when photon-izing an image URL ced2637 Squashed 'libs/editor/' changes from a92ad9d..260a0d5 76db6ed Merge commit 'ced263752a32fb381556cee59b6a2031f5b4f380' into hotfix/5.5.1 71bd8cf Merge branch 'release/5.5' into develop d0d8dd4 Squashed 'libs/editor/' changes from a2a6a7c..a92ad9d d9bd889 Merge commit 'd0d8dd46c2b8223d66ec3e80578788d1b6cd8b85' into release/5.5 38a413e Merge pull request #4239 from wordpress-mobile/issue/3924-method-count 5d5881f Merge commit '937086d17b266a17ea6bdd144656cd5282fa86d7' into issue/4235-locale-getdefault-usage b0fc653 changed Locale.getDefault() occurrences for the slightly enhanced LanguageUtils.getCurrentDeviceLanguage() 3aa9746 moved LanguageUtils to Utils. + split getDeviceLanguage into Code (for string) and Locale for reuse as suggested in code review by @maxme e8bc7cb Merge branch 'develop' into issue/3924-method-count 405772b Merge branch 'release/5.5' into develop 771c065 Merge commit '49ac39827552c17c8d5b65eca236a55961cf6814' into release/5.5 87ade41 Merge commit '1cf141b3362c5c44f27a8b65775d3db27ac5756a' into release/5.5 73cdb59 Merge commit '65eec31755233d054ff01bf729eea6d233f6d7df' into release/5.5 9db27cb Merge commit '2fc5d53d4ba45ed45c806a5ac0772458a4ef403e' into release/5.5 79a0669 update compileSdkVersion and buildToolsVersion in every subtrees c549691 update gradle wrapper to 2.14 5f8b37b Merge branch 'release/5.5' into develop e0ffd09 Merge commit '19320ef6206ed7104072d5a2f7fb7896c8e84596' into release/5.5 3086a32 Updating gradle plugin to 2.1.2 f7cda1e Merge branch 'hotfix/5.4.1' into release/5.5 9b3840f Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1 704f8db Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size 0a145fb Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1 2dbc2de new MediaUtils function: getImageWidthSettingFromString 380157e Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 8da6671 Merge branch 'release/5.4' into develop 457afa7 Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 081a336 Merge pull request #4100 from wordpress-mobile/feature/people-management-sync 6cf2b92 Merge branch 'release/5.4' into develop 196d4db Merge remote-tracking branch 'origin/develop' into feature/people-management-sync bbc3cdb Clarify comments and parameter names 750ef77 fix #4114: remove the URL scheme if it's not http or https during URL sanitization d1cbe1f Updating to support library 23.4.0 30c98a2 Merge branch 'develop' into issue/3791-support-library-23.2 4fad089 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 81c3fe1 Merge branch 'develop' into feature/gravatar-upload-okhttp cfb9b6e Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 0c22fb1 Merge commit '3b37573c3bef0da83e7c0991c3ddd7069ea34947' into develop 1074c65 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 c0cfd6e Adds permission utils for calling via fragments c0459ed Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 54bafee Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop 140b53d Merge branch 'develop' into issue/3791-support-library-23.2 9a92f90 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync af9844c Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update 084c5aa Updating to gradle 2.0 2e62958 Updating support library to 23.3.0 a75ef12 Updating to gradle 2.0 34efe57 Merge branch 'develop' into issue/3791-support-library-23.2 003b573 Updating to rc3 8b8e2a3 Updating build.gradle to latest rc3 cfe3161 Merge branch 'develop' into issue/3791-support-library-23.2 4260b4c Merge pull request #3919 from wordpress-mobile/issue/update-build-tools 31aac03 Merge branch 'feature/people-management-sync' into feature/people-management-network-and-data-layer 231a3d3 Merge branch 'release/5.2' into release/5.3 ee13047 Updating the rest of the modules to buildToolsVersion 23.0.3 1e5c5b4 Updating the rest of the modules to buildToolsVersion 23.0.3 c674a05 Merge branch 'develop' into issue/3791-support-library-23.2 5fdae18 Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 806da2e Added People to AppLog f1fb2d3 update to android-gradle-2.0.0-rc1 5cc12c5 upgrade to gradle plugin 2.0.0-beta7 3a24940 Merge branch 'develop' into issue/3791-support-library-23.2 0a90538 update to com.android.tools.build:gradle:2.0.0-beta7 0acc238 Updating support library to 23.2.1 39c5bab Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 2384a34 Comment getQuantityString() a11f2f1 use String.format(getString(format), ...) instead of buggy getString(format, ...) 86e6f3d replace plurals with a utility method 17cd3f6 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master e191d70 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 6abfe1f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 5bcdcc7 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 1851efb Mark the util WPEditText as deprecated 4871c5f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 4fc64d3 Updated gradle to 2.0.0-beta6 aa8cdac Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9cc32d5 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor e072fc5 Merge branch 'develop' into feature/visual-editor b39105c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 87d1cd7 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor e70aee7 Merge branch 'develop' into feature/visual-editor e67e887 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager f925e0d Merge remote-tracking branch 'origin/develop' into feature/account-settings 493a28a Upgrade gradle plugin to 2.0.0-beta5 96cb4ab Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes e0191f1 Merge remote-tracking branch 'origin/develop' into feature/account-settings 3441e62 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 73e3d28 Fix media isVideo/isValidImage/... utils method 3ed94cf Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 856eb76 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop 24008e3 Merge remote-tracking branch 'origin/develop' into feature/account-settings edcbd68 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans f5b119a Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 8d98820 Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 3b9f0ff update to android gradle plugin beta4 ab9dae2 Merge remote-tracking branch 'origin/develop' into feature/account-settings a4144bb Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 141c92d Reverts a previous unnecessary change that's accidentally committed for StringUtils 68a7d4c update to android gradle plugin 2.0.0-beta-2 - Instant Run a5357b9 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment c8adccf Use lowercase locale array to make sure language is pre-selected 82a2168 Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it. 64985ea Merge remote-tracking branch 'origin/develop' into feature/account-settings c18d478 Download available plans for a site. Refactoring!! c3a1854 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item 34ddb82 Download global plans from wpcom and parse them. Store the response in AppPrefs for now. d08bbe8 Primary site added to Account Settings (wip) 2ee06c3 Adding SETTINGS log tag and logging unknown language code error 9729cfb Merge develop into site-settings-review 4139806 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop 44d2e6f Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop 0cdc639 Add utility methods to check if a URL is wpcom. Add utility methods that check if it's safe to add the Authentication token to the request. 5055b8a kill StringUtils.getHost function a5efa15 s/getDomainFromUri/getHost/ e395732 4.9-rc-2 / 228 version bump 283f344 fix #3521: use the simplest UnderlineSpan subclass dd8da34 Merge branch 'develop' into feature/site-settings-review e9c777b Allow photon to resize GIFs 2fa7d20 Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop 650e224 Merge branch 'develop' into feature/site-settings-review 0504208 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 48a2e5a fix #3372:Resource Leak in SqlUtils.java e61338d Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop 23824e3 Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop 7d33be7 Moved the check for video to within ImageUtils ad9ee4e Merge branch 'develop' into feature/site-settings-review 880519d suppress lint on missing permission 6726085 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects a5b2379 Add log line that could help us in case of errors in the JSON parsing with queryJSON. 1b1e118 Merge branch 'develop' into feature/site-settings-review 20a169b Better solution: Fix the url within PhotonUtils. Hattip @nbradbury c8fbb97 Revert "Fixes issue where private blog images wouldn't load." d2c5a3f Revert "Killing whitespace." 5d93dc9 Killing whitespace. 269ecdf Fixes issue where private blog images wouldn't load. def84af Merge branch 'release/4.7' into feature/site-settings-review 0939a67 Moved permission check and request to PermissionUtils 6f9c027 Checking media permission when attempting to add media to post 5f585df Merge branch 'release/4.6' into issue/3115-runtime-permissions b68bfa2 first step for runtime location request be9d2c6 Merge branch 'develop' into feature/site-settings-review a760b91 Merge branch 'release/4.6' into develop fecab61 Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release 270aae7 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 15d4aa8 test queryJSON calls with null params 7ddc84c Check null query string 5f84fbe check null source in JSONUtils.queryJSON() fe4b7a6 Merge branch 'develop' into feature/site-settings-review e3636ab update ProfilingUtils usage 0d87149 Merge branch 'develop' into feature/site-settings-review 10c93c3 Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string. 6094d83 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host. 2417bae URL Utils test fix 8d781ba Merge branch 'develop' into feature/site-settings-review 62ce487 generic approach to add parameters to a URL e43fde4 new UrlUtils method: appendPreviewURLParameter 4584693 Updating build tools to 23.0.1 c4e8007 Merge branch 'develop' into feature/site-settings-review 6e4d198 set targetSdkVersion to 23 and clean up lib dependencies 2b95b43 migrate from mavenCentral to jcenter (which is now the default for Android Studio) f185b2e fix lint errors 77a2df2 update to gradle plugin 1.3.1 and gradle 2.6 815a510 upgrade to gradle 2.5 and gradle plugin 1.3.0 b45bc52 Merge branch 'develop' into feature/update-to-gradle-2.4 1aac66a Merge branch 'develop' into feature/update-to-gradle-2.4 7b427ef Updating ActionBar title. Save button is now Undo. 889623c Merge branch 'hotfix/4.1.1' into release/4.2 3930cca Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update ae06412 Updating EditTextUtils.getText method instead of creating new one. b4e09e5 limit text to 524288 characters which is always < 2Mb with UTF-8 adb6d46 Merge branch 'hotfix/4.1.1' into release/4.2 7e034f1 fix #2855: delete big comments and truncate new inserted comments da7a178 Coding Styles 291d107 Make sure the context passed to checkConnection is not null 9431ed1 Updated support library and build tools 3a23b4a update to gradle android plugin 1.2.3 28f0863 update support lib to 22 58c0fff update to android-gradle plugin 1.1.3 and build tools 22.0.1 ab1f64f Introduce our version of MarkView 8a01665 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted 519dbb6 Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop c83436d Fixed notifications fragment for self-hosted a30fad3 Merge branch 'release/4.0' into develop 926195e Removing potential race condition with WP image loading threads. 3617ff0 Returning to the post editor won't crash if Activity was destroyed. e5eb8c7 Add more audio formats a70f524 Handle audio files in media browser 260faf4 Merge branch 'release/4.0' into develop a91cbd6 Merge branch 'hotfix/3.9.1' into release/4.0 16e01b6 Catching other unknown URL exception. d70578c Making sure Cursor is closed if exception gets thrown. 21508f3 Catching unknown URL exceptions. 41e732c Merge branch 'release/4.0' into develop 9915efb Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0 8821cb2 javadocs 1254283 If string is empty return empty string instead of null a8081b7 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 04a450e javadocs 17cda45 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 0d83504 If string is empty return empty string instead of null fa1c9ce Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer 896b7bd 1.5.0 version bump 565f756 Merge branch 'develop' into feature/modularize-editor 7c7a06f Added support for `WPWebViewClient` to pass the token for image requests. 7a76fe8 Merge branch 'hotfix/3.8.1' into release/3.9 35393b3 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation 1837271 Merge branch 'develop' into feature/modularize-editor 112282c fix #2328: sort blogs with an empty title by their hostname 349e94c Merge branch '1628-mediapicker' into feature/modularize-editor 531b986 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor ee83fe3 comment CustomSwipeRefreshLayout.onTouchEvent 3d69956 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException 2b40042 Merge branch 'develop' into feature/modularize-editor d370d2b Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state 80d824c Merge branch 'develop' into feature/modularize-editor f0c78fd fix typo in a comment 8fcc28f delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712 dca8e8b styling update b4f9350 Merge branch 'release/3.7' into develop e43ec21 Merge branch 'develop' into feature/modularize-editor 09ce398 fix #2336: check for null text entry, replace them with a string 0a59ffd split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils cb0468a move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils d9c1111 Merge branch 'develop' into feature/modularize-editor 2b07717 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview d7f6b10 All gravatar requests now default to 404. fa54198 Added DEFAULT_BLAVATAR constant b67cc7b WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter f6876ae Moved fixAvatar routine to GravatarUtils d7ae1ab Added DefaultImage enum to GravatarUtils 55a65b2 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 0a14aa6 Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor 02381ef Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds dea1fbf remove extraneous static field 73dbd93 Merge branch 'develop' into feature/modularize-editor 416c772 move WPEditText to WordPressUtils and reorganize WordPressUtils 559f9b2 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) dbd179a Blavatar defaults to 404 ec89c80 Added blavatars to ManageBlogsActivity f017173 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor 75d5f26 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 38c7a76 Merge branch 'release/3.7' into develop d61a71f comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there 52e54c8 Add strip=all to all Photon requests 5416f97 Squashed 'libs/editor/' changes from fc65662..86805a0 29beaed fix #2293: remove leading double slash in URLs returned by wporg servers 27a8d78 Merge branch 'release/3.7' into develop 7c3ec06 fix AppLogViewerActivity when a log is message is null 4c02650 Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 706a65f new BlogUtils.getHostNameFromAccountMap function e873ea3 Theme live preview no longer changes the activity title 185582c Photo viewer now uses low quality for the lo-res image 6023822 Simplified comments 0a19498 Switched to quality enum which defaults to medium 5ae1b87 Added default quality param to photon 728a121 html encode log entries in AppLog.toHtml() cb9fefb fix #103: retain menu drawer scroll position after switching activities 502a9e4 Merge branch 'develop' into issue/985-make-sfactory-private 2818082 fix build files for android studio 1.0 96f3962 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private f916a34 update support lib version for travis 195bd96 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat b28e296 Merge branch 'develop' into release/3.4 743ce48 remove unused code (refresh button) a9e4c30 fix #985: maks sFactory private - force injection in test module 906b3e8 Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java 4ceb0c3 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 a9a490b Removed unsuccessful fix for #1982. 957c1b2 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 93a23da Merge branch 'develop' into feature/material-appcompat 3f731d6 Merge branch 'release/3.4' into develop aaccb70 Merge branch 'hotfix/3.3.1' into release/3.4 6a22580 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat e470cfb update subtrees to use build tools 21.1.1 dfd77e4 rename PullToRefresh to SwipeToRefresh dffe39a remove unused viewClass in PTR constructor 0bb12ed fix circle spinner color style 13e613e Return a copy of the JSONObject in getDiffableValue(). 52d5ec2 replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 3d9cb0f Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 9d2d48b Merge branch 'develop' into issue/1958-round-avatars bd0a083 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 077c819 Merge branch 'hotfix/3.3.1' into release/3.4 ded9e7c upgrade to android-gradle 0.14.0 fa47b61 Rounds all WPNetworkImageViews with `AVATAR` type. 89d31b5 Initial commit adding mentions to notification comments f2ed1d3 Added image spans directly instead of using Html.fromHtml(). e154814 Merge branch 'release/3.2' into develop aeabeae fix debug/release build propagation to sub projects 93935be Merge branch 'release/3.2' into develop b3f359a Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign 24208fa Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet c7476fc Merge branch 'hotfix/3.1.2' into release/3.2 07bf633 fix #1821: remove DisplayUtis.isTablet() method 0ebd130 Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null fdf89f9 Merge branch 'release/3.2' into feature/notifications-redesign 5fca796 Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 470f5c8 Merge branch 'release/3.2' into develop e3795fe Merge branch 'hotfix/3.1.1' into release/3.2 e514f75 Merge branch 'hotfix/3.1.1' into develop 35a51e3 remove isTablet() check fd177a4 Merge branch 'release/3.2' into feature/notifications-redesign cb63da7 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" ac65c2f Merge branch 'develop' into feature/notifications-redesign c9232b1 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance 485abe4 fix lint error in utils 5026c92 Merge branch 'develop' into feature/notifications-redesign eff81c0 Removed aggressive `JSONUtil` logging 0868a89 update support-v13 library to version 19.1.0 5a1e321 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images 91cd079 disable refresh on the attacher ad64df3 use the PTR library version 0.9.7 7266712 set network refresh mode as default ac4915a remove unused code 893ec6f add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled f45e000 move NetworkUtils to WPUtils subtree c050f8e Updated comment 9b96cd2 TextView content is reset to itself to force it to correctly resize using cached image b1ceab2 More cleanup 9a34a96 Cleanup WPImageGetter based on code analysis bba036d Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel efd0501 Merge branch 'release/3.1' into develop 4982d56 Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1 688fb0c fix #1762: show blog url in the share blog spinner if the blog title is an empty string cdbab65 remove ProfilingUtils.getVersionName calls e831bcc remove unused method from ProfilingUtils b5ffc30 move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods 9f6d5ce Merge branch 'develop' into feature/notifications-redesign af63e40 Rewrote the AppLog viewer to use a ListView+adapter a2f1d4a Merge branch 'develop' into issue/1690-track-last-seen-screen 94f7111 remove unused util file ActivityUtils ebde141 Merge branch 'develop' into issue/1684-stuck-notifications 2969fde Bump libs/utils version number. 366cf9a Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size d07c557 generic way to track last seen activity - requires GET_TASKS permission 0c31abc Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. 5db4a73 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. f45eed5 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update c3f80f3 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user. 588649b Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash 259a603 fix #1681: null check 78b8325 Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column b18f6ce Merge branch 'Develop' into 'notifications-redesign' git-subtree-dir: libs/utils git-subtree-split: 5503849
aforcier
added a commit
that referenced
this pull request
Nov 28, 2017
3a16fd3bb3 Merge pull request #5 from wordpress-mobile/issue/move-to-bintray 091dddffdf Add the bintray example command to the README 3a6d1f16a8 Use gradle wrapper v4.1 f942982bcd Remove Sonatype config and use Bintray instead af61bccad8 Merge branch 'release/8.2' into release/8.3 2fab11c3a8 Merge pull request #6625 from wordpress-mobile/feature/global-notification-setting 0e9d87116e Add a comment about waiting for the userame 7c99503e6d Wait till username is avail to alias anon user 8fe66c50fe Add a comment about waiting for the userame 6d2e4ffb77 Wait till username is avail to alias anon user 7194cea70e Add analytics to global notification preference 398ef2b51c Analytics: Adds stat to track prologue pagination. 858982dad3 Add new track for LOGIN_MAGIC_LINK_OPEN_EMAIL_CLIENT_CLICKED 4a45a4eaa2 No retry screen on android so, remove this Track 6e288e0887 Merge branch 'develop' into feature/new-login 7da82ac57e Merge branch 'develop' into feature/new-login 9498a9c265 Add analytics to editor beta label 1b87a87a79 merged release/7.7 - fixed merge conflicts 91d690ff07 Rename read more event to avoid confusion 171189ab41 Refactor events for consistency a51fe5d24d Add new editor buttons to analytics tracker 7a24c56560 Add open beta message analytics 4c0d942eca Add analytics to editor promo dialog f05612b38c Merge branch 'develop' into feature/new-login 8e643a28e1 Add Nosara and Crashlytics stats to video optimization 8731013ea8 Track permission results 4005215135 Update gradle to 2.3.3 for AS 2.3.3 868d3d8a34 Merge branch 'develop' into feature/new-login 7955478cb2 Upgrade support lib and build tools to latest 9029c08592 Merge branch 'feature/new-login' of github.com:wordpress-mobile/WordPress-Android into issues/login-analytic-keys 227f1b3ec7 Analytics: Removes keys. d658b80754 Analytics: Changes from code review. 0799b50862 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issues/login-analytic-keys a9e19eebb2 Merge branch 'develop' into feature/new-login 893946b942 Remove Mixpanel 4018b93ff6 Update build files for AS 2.3.2 be8b3ce60d Merge pull request #5879 from wordpress-mobile/issue/5877-aztec-tracking 6ad3c2750d Add missing Aztec analytics descriptors 70312fde80 Rename tracking variables to better distinguish visual editor from Aztec 8664d1a8b7 Bump media picker event in Nosara/Tracks 9d7450b6fc First part of "media picker" analytics tracking 838e9d39d4 Add a feature flag for the wizard-style login flow 2c616d2ba2 Analytics: Adds new Login related keys to trackers. c467a24c9f Merge branch 'release/7.2' into develop a8cf040cfd Merge branch 'release/7.1' into release/7.2 b44d72f1a0 Merge pull request #5626 from wordpress-mobile/issue/check-null-analytics-events ad3e40a126 Analytics: Adds new login event keys 8c4c093beb Update Tracks to 1.1.2 8a9564bccb moved vector drawables used in notifications quick actions to the v21 specific folder /res/drawable-anydpi-v21 f8f8168473 Check if the user is null before bumping the event into Tracks 41d9606dc9 Check null key values on Properties passed to events 951ea68982 Rename variable 5717e61efd Check if the event is valid before bumping it 7ed115563b Add method that ckecks if the event is valid (not null for now) 8a89af0fd6 Add analytics exception 3fe8311fc9 Merge pull request #5564 from wordpress-mobile/feature/tappable-my-site-header 3f1e1c3821 Updating gradle plugin to 2.3.1 7aef12044c Merge branch 'release/7.1' into develop cb49c6ed88 Merge branch 'release/7.0' into release/7.1 d62dcfc55d Adds OPENED_VIEW_SITE_FROM_HEADER analytics event e4e59fc09b Fix #5554: check for an eventual null username before aliasing 11501a48b4 Combine `case`s together since noth of them were doing the same thing. 36def1567e Make sure to track new picture/video, and picture/video from device library separately in analytics aa7f6216b8 Merge pull request #5495 from wordpress-mobile/issue/add-analytics-to-media-service 1db37498fe Change event name on Mixpanel f455c913b7 Track analytics for the Optmize Picture feature d683a60ed6 Add new media analitycs events to Trackers 9cf25b576f Add new analytics for MediaUploadService d8734653c6 - Introduce a new routine to retrieve the correct file path from a URI. - Bump Analytics for media added to the WP Media Library. bb01eda3fb Analytics: Adds comment to method. 585390efa4 Login: Adds error details to events. 7e91bd1d45 Track optimize images Analytics 644fdce0c2 Merge branch 'develop' into feature/fluxc-integration d08f127e6e Use latest utils lib to fix lint errors 8eef8a40e9 Update to gradle plugin version 2.3.0 a52f1b2603 Merge branch 'develop' into feature/fluxc-integration 73112ad027 Add Analytics 3736d76632 Merge branch 'feature/aztec-integration' into feature/fluxc-integration 366809ead2 Show different editor options depending on Aztec feature flag settings a356bcb0ef Merge branch 'develop' into feature/aztec-integration 8b6aacc459 Merge branch 'develop' into feature/fluxc-integration 9ad459bde6 Updating buildToolsVersion and support library to the latest versions 47731a2f26 Use editor selected in App Settings 7cdaef8245 Solved conflicts, but a lot of things need to be fixed. Merge branch 'develop' into feature/fluxc-integration-merge 1bbe4a64e8 Merge pull request #4918 from wordpress-mobile/issue/4903-new-signin-tracks 2e0ff1f612 Tract account creation failure 1fc56d8689 Track email exists when creating new account 35504d48ad Track username exists when creating new account 1705815e13 Track account create initiation 38aef33d8f Track login screen shown a993cc5d54 Updating grade plugin 689a2c2aa2 resolved merge conflicts d94378fd95 added analytics tracking when user enable/disbale pending draft notification settings 8b550093e3 Merge branch 'develop' into feature/fluxc-integration 6dd198c75b added dismiss and ignore actions, tracking in analytics for each action, and handling of ignore and dismiss in NotificationsProcessingService ee0ebfbee5 Upgrade to Support Lib, build tools v25.0.1 3190de0a56 merged develop and resolved merge conflicts 552b6ef0b3 added proper analytics tracking handling for Mixpanel and Nosara 8805328bc3 took snackbar action off, and now snackbar is not presented anymore once user does first use swipe c70d6b48ff added analytics tracking 515a5f568e Merge branch 'develop' into feature/fluxc-integration 74352baae6 Merge develop into feature/fluxc-integration Major changes: * Magic links integration * WordPress.com link interception * Simperium Removal 85bade2fb9 Merge pull request #4757 from wordpress-mobile/feature/track-not-default-handler 2c56a43554 Tracking Quick Actions by using a new "is_quick_action" property instead of new event names in Nosara. 5817f23b9e Add quick actions events to Mixpanel impl, and also added missing notifications events to the Mixpanel impl. 946e236174 Add quick actions analytics events c87f9e7784 Merge branch 'develop' into feature/track-not-default-handler 5faa35ec07 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/4680-reader-related-traintracks 06868c0663 Merge pull request #4752 from wordpress-mobile/feature/additional-helpshift-events 796fa9f698 Track when not the default WPCOM post URLs handler be12f5e5af Adds additional Analytics events for Helpshift 5da5469876 Add tracks for viewing an unauthorized post 58a8cf1aaa Add extra track points for reader actions 316f368fca Separate tracking when local/global related post clicked 5fdf8bda70 Merge branch 'develop' into feature/intercept-wpcom-post-url 6ff1fcd13b Updating build tools and compile/targetSDK to 25 along with support libraries f0612640a9 Merge branch 'develop' into feature/intercept-wpcom-post-url 048b38aa97 Add Tracks on starting sign in from Reader 847f41f90a Add Tracks for intercepting WPCOM post URLs 32c5915a89 Track deeplinked but fellback to external browser f017f8321b update missing build files to 2.2.2 aa1abf94cf Update to Android Gradle Plugin 2.2.1 18972239ad Merge branch 'release/6.0' into develop 2e5930008b Intercept WPCOM Reader Blog post URLs, open Reader d441a93172 implementation that saves a note built from the PN payload to simperium so fragments don't need to know where the Note is coming from fbd5b5562f Track blog/feed post intercept a7eee0e1a4 Track app launch via deep-linking dffe622751 adding ability to extract JSON from a Note to persist instance on rotation acc651c7f2 added note not found analytics tracking 43b7cecf70 Removed READER_RELATED_POST_SITE_CLICKED b8c9079dd9 Added READER_RELATED_POST_SITE_CLICKED 9687166832 Added `READER_RELATED_POST_CLICKED` to analytics 6ab5f2dbb5 Fix wpanalytics build with gradle 3.1 d0a445b461 Updating gradle version to 2.2 for Android Studio 2.2 5969e86885 Issue/4462 reader traintracks (#4540) 2dc7464c7f update travis config and bump build tools to 24.0.2 f0e16c8733 Update com.android.tools.build:gradle to 2.1.3 5ccbbc9210 Merge pull request #4421 from wordpress-mobile/update-dependencies 8e2fb4e903 Adding analytics for creating a new site 00459c8d48 Updating libraries to use correct/latest Utils 0bb1976cc0 Targetting version 24 39e7076726 Updating to build tools 24.0.1 a9affd086a Merge branch 'release/5.6' into release/5.7 6d5a0667eb Reader: Updates search related analytics. 06715dc721 Drop version code from analytics metadata 1149cb347d Removed hardware keyboard tracking from metadata 7f431f8e3d Track hardware keyboard usage in user metadata 402ecd5a68 Refactored analytics metadata to use an AnalyticsMetadata model object 074ab580dc Merge branch 'develop' into feature/reader-search-master 3a6820cf57 Merge branch 'develop' into issue/3924-method-count 68ba185ed3 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/reader-search-master d58ab99999 Merge pull request #4233 from wordpress-mobile/feature/gravatar-permission-denied-analytics e333be97ab update compileSdkVersion and buildToolsVersion in every subtrees 0bb7019bba Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/reader-search-master 6ca20ac6da update gradle wrapper to 2.14 4f88896146 Track the Gravatar permissions interrupted case ec9ba35b67 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/reader-search-master f24403c26a Updating gradle plugin to 2.1.2 800f97d6ab Merge pull request #4163 from wordpress-mobile/issue/4105-reader-search-analytics 23892072f3 Capitalize words in the MP event name ba0b9ab38a Better naming using "upload" instead of "update" df1703afd0 Track Gravatar update failure 22244cfe1d Merge branch 'hotfix/5.4.1' into release/5.5 93e559b0ca Update to latest utils version 782b2f3d38 To match the web app, renamed READER_SEARCH_RESULTS_LOADED to READER_SEARCH_LOADED and added query to properties 118fea7fff First pass at search analytics f6d6e7746a Fixing typo for magic links e667a3ab71 Merge branch 'release/5.4' into develop 5f11a43e62 Merge pull request #4100 from wordpress-mobile/feature/people-management-sync 12ab8f3717 Merge branch 'release/5.4' into develop 4409a3ae29 Renamed OPENED_PERSON as OPENED_PEOPLE_MANAGEMENT b5470c9778 fix tracking of new editor disabled ab08d9e1a9 People management event names added 8f7989f792 bump minSdkVersion from 14 to 16 63d7a03f57 remove specific code for API < 16 in analytics 113d8e5c3e Better name for the gravatar tooltip tap event 8d5944cf06 Adds tracking to the Gravatar change flow a2fa20aa82 Merge branch 'develop' into feature/magic-link 1348402881 Merge branch 'develop' into feature/magic-link 6c0c529bf5 Merge branch 'feature/update-gradle-plugin' into feature/3988-ab-testing 9af493aff3 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 084a960037 Merge branch 'develop' into feature/3988-ab-testing 0484c2417f Adding AB testing started tracking 232e6ab96e Merge branch 'develop' into feature/magic-link d7e5867648 Add new Analytics Event cbd7dd2323 Adding Magic Link analytics 84457bce93 Drop me_ prefix from Nosara event names 3ae8e8f240 Fix /me analytics names to follow the action at the end convention 097cfae841 Updating to gradle 2.0 e55d56329b Updating to rc3 af53421348 Merge pull request #3769 from wordpress-mobile/feature/smart-lock-for-passwords f048dc1bcc Merge pull request #3919 from wordpress-mobile/issue/update-build-tools f722b54ff7 Merge branch 'release/5.2' into release/5.3 0cf6554d2c Updating the rest of the modules to buildToolsVersion 23.0.3 35bfcbc958 update to android-gradle-2.0.0-rc1 3684b616c5 upgrade to gradle plugin 2.0.0-beta7 db05f4eb78 New events LOGIN_AUTOFILL_CREDENTIALS_FILLED/UPDATED 42786954c1 Add missing event in Mixpanel analytics 554fcaabd2 Merge pull request #3853 from wordpress-mobile/feature/health-check-mvp b8f4e0df45 update to com.android.tools.build:gradle:2.0.0-beta7 bb0027686e Merge branch 'develop' into feature/delete-site-redesigned bf8cafb7b7 Adding purchases request 604304141e Adding Mixpanel and Nosara events 225d457f41 Renaming request to response 8ecfcdaa47 Adding full analytics for delete site f4e3bd764c Adding tracking additions for delete site ce31a21831 All mentions of //future removed from Analytics events 0d09c98df4 Add analytics to track when the app settings is opened 09aec5aaa7 Bump Analytics when the user inserts an invalid URL ff22f2b6b8 Language change event renamed and will always be tracked b19792156e Updated gradle to 2.0.0-beta6 1473fee007 Merge branch 'develop' into feature/visual-editor 6956e3f06f Upgrade gradle plugin to 2.0.0-beta5 afad5e67a4 Fix #3582: new Visual Editor events 31bcb4fdc5 Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 66fa0fe065 update to android gradle plugin beta4 4d4b517aa6 update to android gradle plugin 2.0.0-beta-2 - Instant Run 7ba34afaf6 Updating to latest versions of internal dependencies 6d53ab4a69 Keeping internal dependencies always pointing to the latest version 47c95ea71b Merge commit '260ce85614ffeefc057efe4eb909706a013500ae' into develop 260ce85 Bump version to 1.2.0 8c839cc s/EDITOR_UPDLOAD_MEDIA_FAILED/EDITOR_UPLOAD_MEDIA_FAILED/ f92ee857fc Merge pull request #3568 from wordpress-mobile/feature/site-settings-review 39faa5c00b Merge commit '2bc2b1ff4cb163b6795e974afc9688b9d552b8f7' into develop 2bc2b1f Bump version to 1.1.0 29d0d2c2da Merge develop into site-settings-review d187e35ecb Add visual editor events to mixpanel and nosara trackers 03ea4ab Add visual editor events to mixpanel and nosara trackers 6b8bc057ca Add EDITOR_ADDED_VIDEO_VIA_LOCAL_LIBRARY and EDITOR_ADDED_VIDEO_VIA_WP_MEDIA_LIBRARY to Mixpanel and Nosara trackers baa34d5 Add EDITOR_ADDED_VIDEO_VIA_LOCAL_LIBRARY and EDITOR_ADDED_VIDEO_VIA_WP_MEDIA_LIBRARY to Mixpanel and Nosara trackers 62b575f226 rename property to match the iOS project 158b3f7 rename property to match the iOS project a6cffcc1fc new events and renamed s/Closed Post/Closed/ 5201e74 new events and renamed s/Closed Post/Closed/ 2be54a517f Renaming language selection stat 35cf64c0f1 Add Analytics for notification settings 027e8f6 Add Analytics for notification settings f07aad12f6 Fix a typo edd4193 Fix a typo b7425f5707 Fix naming conventions on some stats widget events for the Mixpanel tracker. f42b776 Fix naming conventions on some stats widget events for the Mixpanel tracker. eee1172a86 Add ACCOUNT_LOGOUT event to Mixpanel tracker. 7a659c6 Add ACCOUNT_LOGOUT event to Mixpanel tracker. 87cdc1af78 Tag OPENED_MY_PROFILE and OPENED_ACCOUNT_SETTINGS as future events 7a91682 Tag OPENED_MY_PROFILE and OPENED_ACCOUNT_SETTINGS as future events 173822c7ac Add a comment line "future" near READER_LIST_* events that were added but not yet used. 5236e54 Add a comment line "future" near READER_LIST_* events that were added but not yet used. f2d8397108 Merge branch 'feature/site-settings-review' into feature/3441-site-settings-cleanup 5b8dbd410b Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 36e3c7b Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 7a9af8520d Merge branch 'release/4.8' into develop 229c864 Merge branch 'release/4.8' into develop 57f2b1b510 Removed `READER_FRESHLY_PRESSED_LOADED` 54088ae Removed `READER_FRESHLY_PRESSED_LOADED` c7be31b34e Merge pull request #3501 from wordpress-mobile/issue/3487-correctly-track-user-blogs-num be29fba Merge pull request #3501 from wordpress-mobile/issue/3487-correctly-track-user-blogs-num 38db25d44d Update user properties before tracking the event. d5584c6 Update user properties before tracking the event. 4d0d9482df Remove Reblog event. 1e9c220 Remove Reblog event. a63e30395b Remove Stats Opened Web Version from Analytics 71f9b09 Remove Stats Opened Web Version from Analytics 869151e3f6 Updating analytics based on feedback from PR 8491c8cbdc Merge pull request #3488 from wordpress-mobile/feature/add-profile-account-settings-analytics-values 213467b Merge pull request #3488 from wordpress-mobile/feature/add-profile-account-settings-analytics-values 9768530b06 Adds My Profile and Account Settings Analytics tracking values a945c50 Adds My Profile and Account Settings Analytics tracking values 55b236a206 Adding analytics c8e5c0448f Track APPLICATION_INSTALLED event 4226602 Track APPLICATION_INSTALLED event 332f718676 remove unused manageSession parameter caf8a62 remove unused manageSession parameter 2664bf1882 Use the correct event names in Mixpanel. a385661 Use the correct event names in Mixpanel. 6a7fac6233 Use the same event name of the iOS platform for the "Push Notification Tapped" event. 38693b9 Use the same event name of the iOS platform for the "Push Notification Tapped" event. 256c260a83 Do not track "dismissed" and "ignored" PNs to be in par with iOS. 3067bf5 Do not track "dismissed" and "ignored" PNs to be in par with iOS. 6c777ef71c - Track Push Notifications ignored event (when the user opens the app without interacting with the PNs) - Add the tracking code for PNs to Mixpanel bb03085 - Track Push Notifications ignored event (when the user opens the app without interacting with the PNs) - Add the tracking code for PNs to Mixpanel 9fbbd090df Start tracking PNs analytics 33f06ba Start tracking PNs analytics 46e704b36e Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 29b755f Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 8375059c06 Refactoring cases to be consistent with previously existing tracking 12e5bb5 Refactoring cases to be consistent with previously existing tracking 0384a96cc3 Adding analytics events e8ed675 Adding analytics events faeab833a2 remove unused dependency in WPAndroid-Analytics 92ca93f remove unused dependency in WPAndroid-Analytics 96f826ed6d Unify "anon" users by calling the new `trackAliasUser` method introduced in Tracks 1.1. 6141212 Unify "anon" users by calling the new `trackAliasUser` method introduced in Tracks 1.1. c2f12eff03 Update to Tracks 1.1.0 09bcd4d Update to Tracks 1.1.0 1e1305cd6f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/2968-stats-widget-new f4a7395 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/2968-stats-widget-new 1efff33ae0 Reader: Organizes and adds new analytics for the reader. f0ce2b8 Reader: Organizes and adds new analytics for the reader. 0c035c9b22 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/2968-stats-widget 912796d Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/2968-stats-widget ab5a4bd3eb Add a flush method to Tracker interface and use it to track analytics for the widget. f246a39 Add a flush method to Tracker interface and use it to track analytics for the widget. 4dcfe22b8d track APPLICATION_UPGRADED in Mixpanel 10e7328 track APPLICATION_UPGRADED in Mixpanel b6f15b1ef7 Track Analytics usage. 49a090d Track Analytics usage. e293858b5b Updating build tools to 23.0.1 1898b9d Updating build tools to 23.0.1 47e5569447 set targetSdkVersion to 23 and clean up lib dependencies 5998b30 set targetSdkVersion to 23 and clean up lib dependencies f8f0591cb1 migrate from mavenCentral to jcenter (which is now the default for Android Studio) 7c6d39d migrate from mavenCentral to jcenter (which is now the default for Android Studio) 0e36206b5a upgrade mixpanel to 4.6.4 0b50795 upgrade mixpanel to 4.6.4 e1f7eb7c40 Merge branch 'develop' into feature/update-to-gradle-2.4 ddb8bdb069 Merge branch 'release/4.4' into develop 3f7b123 upgrade subtrees to latest android tools a91a01d9e2 upgrade subtrees to latest android tools bdf0f76 Merge branch 'develop' into feature/update-to-gradle-2.4 c77e02173e Merge branch 'develop' into feature/update-to-gradle-2.4 a559239 upgrade to gradle 2.5 and gradle plugin 1.3.0 9190db3354 upgrade to gradle 2.5 and gradle plugin 1.3.0 0709f0e Merge branch 'develop' into feature/update-to-gradle-2.4 3832cce7b3 Merge branch 'develop' into feature/update-to-gradle-2.4 f40c250 Merge branch 'develop' into feature/update-to-gradle-2.4 70041c43c8 Update Tracks to 1.0.5 ee78518293 Throw an IllegalArgumentException exception if a null context is passed eda33fd Throw an IllegalArgumentException exception if a null context is passed 641f47228f Use a shorter version of the code that generates unique IDs. 7c69f90 Use a shorter version of the code that generates unique IDs. 00bf59f106 Add the name of the class that gets the anonID regenerated c1ea6ac Add the name of the class that gets the anonID regenerated 133f2b78f6 Added the correct implementation of .org user tracking to Mixpanel 72bb6d7 Added the correct implementation of .org user tracking to Mixpanel d19c011db9 Keep building/moving stuff in a common base class that will be used both in Tracks and Mixpanel Tracker. 6516e06 Keep building/moving stuff in a common base class that will be used both in Tracks and Mixpanel Tracker. 46ba0562dc Move Tracks anonID related methods to a common class. c37552f Move Tracks anonID related methods to a common class. 93fd619091 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/3043-remove-application-started 9f4f4f3 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/3043-remove-application-started 1022fec17a - Removed `application_started` event. It's not used in any funnels and generates confusion. - Updated the tracking of publishing a post. Also fixes issues tracking of published post. 9bc5bfa - Removed `application_started` event. It's not used in any funnels and generates confusion. - Updated the tracking of publishing a post. Also fixes issues tracking of published post. e189b8aa27 Update Tracks lib to version 1.0.5 4dcd657 Update Tracks lib to version 1.0.5 f71193b Merge branch 'hotfix/4.3.2' into develop fa1127ca07 Merge branch 'hotfix/4.3.2' into develop b143d50320 Merge branch 'hotfix/4.3.2' into release/4.4 88020dc Rename OPENED_SETTINGS to OPENED_BLOG_SETTINGS 4bca430 Bump analytics on the main ViewPager. Also fix other minor issues with analytics. 66fa906 Adds new analytics events for notifications. f7c74bf0f3 Adds new analytics events for notifications. 50d829c101 Merge branch 'release/4.3' into develop 5309a0d Update Tracks to 1.0.4 c169601 Merge pull request #2913 from wordpress-mobile/issue/2903-update-track-to-1--0-4 cf96271 Track Application Upgraded and account logout events. 33fc70c Add missing break statements. b9678b5 Track new events for Insights & Period Stats in Tracks and Mixpanel. 71a3931 Add new events for Insights & Period Stats tracking 52ddeaa Update Tracks to 1.0.4 0be2bbb Updated support library and build tools 61573f1 update to gradle android plugin 1.2.3 0f98685 update to android-gradle plugin 1.1.3 and build tools 22.0.1 62319bf Merge branch 'develop' into feature/wpcom-push-authorization a4adc2e Update Tracks to 1.0.3 57c1043 remove SETTINGS_LANGUAGE_SELECTION_FORCED from Tracks aeaa782 add an event to track when users selecet a different language than the device default ef3aeb6 add app_locale meta property to mixpanel events - this is already implemented in the Tracks library 1691713 Added new analytics properties for push authentication tracking. 36d60e2 Merge pull request #2603 from wordpress-mobile/issue/update-Tracks-lib-1-0-2 45a28c1 rename nosara event f42dbbc Update tracks lib to version 1.0.2 e82ea9e add SUPPORT_SENT_REPLY_TO_SUPPORT_MESSAGE to AnalyticsTrackerNosara.java df5964f Merge remote-tracking branch 'origin/develop' into issue/2470-track-helpshift-replies 841f0c5 Do not use dashes in properties. 137258c Make sure to handle the connection status to WPCOM correctly 8eef4bf Renamed two Reader events that were not updated correctly df51693 Renamed events to have the action last. Also, some events names now use eventprops instead of having the full "action-string" hard-coded in them. efe1e3e update to tracks 1.0.1 git-subtree-dir: libs/analytics git-subtree-split: 3a16fd3bb33baed7a586efd27a9a0eb120630194
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needs review: @tonyr59h