aboutsummaryrefslogtreecommitdiff
path: root/WordPress/src/main/java/org/wordpress
AgeCommit message (Collapse)Author
2016-10-03Merge branch 'release/5.9' into release/6.0Maxime Biais
2016-10-03Use FileProvider to request a camera captureStefanos Togkoulidis
Since Android 7, the `file://` URI scheme for asking the camera to capture to specific file raises an exception. Need to switch to `content://` based schemes.
2016-10-03Merge branch 'develop' of ↵Maxime Biais
https://github.com/wordpress-mobile/WordPress-Android into develop
2016-10-03Merge branch 'release/5.9' into developMaxime Biais
2016-10-03Merge branch 'release/5.9' into issue/4450-helpshift-update-to-4.7.0Maxime Biais
2016-10-01Update Helpshift installConfigMaxime Biais
2016-09-30Notifications: Updates noticons font.aerych
2016-09-30Merge pull request #4567 from ↵Tony Rankin
wordpress-mobile/issue/4539-reader-related-post-track Issue/4539 reader related post track
2016-09-28Revert "Fixed commit issue"Stefanos Togkoulidis
This reverts commit dfa97d9865fdabab86708ccb96bf41fff98f02e1.
2016-09-27Fixed commit issueNawab
2016-09-27Merge branch 'develop' of ↵Nawab
https://github.com/wordpress-mobile/WordPress-Android into feature/Role_Selection_Dropdown # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java # WordPress/src/main/res/layout/people_invite_fragment.xml
2016-09-27click on parent layout role_container for showing the dropdownNawab
used wrapcontent for the dropdown textview moved mRoleTextView initialisation and setRole below the listener.
2016-09-27Merge pull request #4553 from ↵Oguz Kocer
wordpress-mobile/issue/4351-invites-inconsistent-error-messages Align the invites related error messages to the API ones
2016-09-27A bit saner line wrappingStefanos Togkoulidis
2016-09-27Better condition for "sent but with errors" toastStefanos Togkoulidis
2016-09-26literals extracted to string constants for readability/reuseMario Zorz
2016-09-26changed var name to fit code style for local varsMario Zorz
2016-09-26minor style fix: comment indentationMario Zorz
2016-09-27Added show dropdown action on mRoleTextView in PeopleInviteFragmentNawab
Removed Border from dropdown Updated url to Https
2016-09-26Removed READER_RELATED_POST_SITE_CLICKEDNick Bradbury
2016-09-26Renamed to showRelatedPostDetailNick Bradbury
2016-09-26Added READER_RELATED_POST_SITE_CLICKEDNick Bradbury
2016-09-26Track READER_RELATED_POST_CLICKEDNick Bradbury
2016-09-26Null checkNick Bradbury
2016-09-26Create separate method for showRelatedPostNick Bradbury
2016-09-26solved merge conflictsMario Zorz
2016-09-26Added `READER_RELATED_POST_CLICKED` to analyticsNick Bradbury
2016-09-26Merge branch 'release/5.9' into developMaxime Biais
2016-09-26Merge branch 'hotfix/5.8.1' into release/5.9Maxime Biais
2016-09-26Merge pull request #4563 from ↵Maxime Biais
wordpress-mobile/issue/4556-gcm-update-notifs-on-system-bar-crash Issue/4556 gcm update notifs on system bar crash
2016-09-26synchronizing on class instrinsic lock rather than the static ↵Mario Zorz
sActiveNotificationsMap object
2016-09-26adding isEmpty check on sActiveNotificationsMap as close as possible to ↵Mario Zorz
accessing the key, to prevent crash
2016-09-26Re-validate usernames on role changeStefanos Togkoulidis
2016-09-23Use role when validating invite usernamesStefanos Togkoulidis
2016-09-22Revert "Avoid downloading media on the UI thread"Maxime Biais
This reverts commit 6cc56aa1f4cf30ce845ae524caa5d2d2c6e01f90.
2016-09-15Merge branch 'release/5.9' into developMaxime Biais
2016-09-15Merge branch 'release/5.8' into release/5.9Maxime Biais
2016-09-13Support invites API errors: blocked, followingStefanos Togkoulidis
2016-09-13Role label shouldn't be visible if not applicable in People listOguz Kocer
2016-09-13Adds the role string to Role.fromString exceptionOguz Kocer
2016-09-13Return contributor in Role.fromString if no appropriate role is foundOguz Kocer
2016-09-13-Added role faq button actionNawab
-Added linear layout orientation for role textview -Added faq url to strings.xml
2016-09-12Merge branch 'develop' into developNawab Hussain
2016-09-12Merge pull request #4546 from wordpress-mobile/issue/update-to-wputils-1.14Maxime Biais
Update to wputils 1.14
2016-09-12Merge branch 'develop' into developNawab Hussain
2016-09-11Issue/4462 reader traintracks (#4540)Nick Bradbury
* Added TRAIN_TRACKS_RENDER and TRAIN_TRACKS_INTERACT to AnalyticsTracker * Added AnalyticsRailcar model * Added TRAIN_TRACKS_RENDER and TRAIN_TRACKS_INTERACT to nosara tracker * Added TRAIN_TRACKS_RENDER and TRAIN_TRACKS_INTERACT to mixpanel tracker * Moved model, added trackWithRailcar * Changed AnalyticsRailcar to never return null for String getters * Added railcarJson to ReaderPost model * Added railcar_json to post table * Include railcar if it exists when tracking reader post details * Removed AnalyticsRailcar model * Only track railcar for interact/render events * Track TRAIN_TRACKS_RENDER when a post with a railcar is rendered * Added trackRailcarInteract(), required changing AnalyticsTrackerNosara to return event name * Call trackRailcarInteract when tracking reader post event * Use trackWithReaderPostDetails when tracking a post being liked/unliked * Use trackWithReaderPostDetails when tracking a search result being tapped * Removed unused canTrackRailcarInteract from trackWithBlogDetails * Use HashSet to store rendered post IDs * Renamed "Interact" to "Interaction"
2016-09-12Fixed issue #4327 : Apostrophe displayed incorrectly when replying from a ↵Nawab
notification
2016-09-09Replace DateTimeUtils with libs subtree versionAlex Forcier
2016-09-09Fixed issue #4506: User role from Team shows up next to non-user viewerNawab
2016-09-06added plural/singular forms for reader_label_image_count to standardizeMario Zorz