aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-18Merge remote-tracking branch 'origin/upstream-master' into masterHEADstudio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devmirror-goog-studio-master-devmastermainChris Warrington
Change-Id: I63f5e16d09297c48432192761b840310935eb903
2016-10-13Initial empty repositorykuantung
2016-10-05Merge remote-tracking branch 'origin/release/6.0'upstream-masterMaxime Biais
2016-10-05Merge pull request #4604 from wordpress-mobile/fix/role-info-url-untranslatableMaxime Biais
Mark role_info_url as untranslatable
2016-10-05Mark role_info_url as untranslatableStefanos Togkoulidis
2016-10-05Merge branch 'release/6.0'Maxime Biais
2016-10-04Merge branch 'release/5.9'Maxime Biais
2016-10-03Merge branch 'release/5.9' into release/6.0Maxime Biais
2016-10-03Merge branch 'release/5.9' of ↵Maxime Biais
https://github.com/wordpress-mobile/WordPress-Android into release/5.9
2016-10-036.0-rc-1 / 308 version bumpMaxime Biais
2016-10-03Merge branch 'release/5.9' into developMaxime Biais
2016-10-035.9 / 307 version bumpMaxime Biais
2016-10-03Merge pull request #4596 from ↵Maxime Biais
wordpress-mobile/issue/4594-fileprovider-for-camera Use FileProvider to request a camera capture
2016-10-03Add missing fileStefanos Togkoulidis
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-03Fix site_settings_list_editor_action_mode_title for Galician (recently added ↵Maxime Biais
in release/5.9)
2016-10-03es-rVE fix after release/3.9 mergeMaxime Biais
2016-10-03Merge branch 'release/5.9' into developMaxime Biais
2016-10-03Merge pull request #4595 from ↵Stefanos Togoulidis
wordpress-mobile/issue/editor454-fix-null-actionbar Fix wordpress-mobile/WordPress-Editor-Android#454: getActionBar() was returning null on Android 7
2016-10-03Merge pull request #4592 from ↵Stefanos Togoulidis
wordpress-mobile/issue/4450-helpshift-update-to-4.7.0 Fixes #4450: helpshift update to 4.7.0
2016-10-03Fix wordpress-mobile/WordPress-Editor-Android#454: getActionBar() was ↵Maxime Biais
returning null on Android 7
2016-10-03Merge branch 'release/5.9' into issue/4450-helpshift-update-to-4.7.0Maxime Biais
2016-10-03Pull new translation for 5.9 releaseMaxime Biais
2016-10-03Remove unused Samsung check in the release-check.sh scriptMaxime Biais
2016-10-03Add Galician: gl to the list of supported languagesMaxime Biais
2016-10-01Update Helpshift installConfigMaxime Biais
2016-10-01Update to Helpshift 4.7.0 that should fix #4450Maxime Biais
2016-09-30Merge pull request #4587 from wordpress-mobile/issues/4586-update-noticonsEric
Notifications: Updates noticons font.
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-28Merge pull request #4565 from wordpress-mobile/issue/4454-crop-crash-zero-widthNick Bradbury
Upgrade image cropping library to latest version (New PR)
2016-09-28Merge pull request #4575 from wordpress-mobile/fix/remove-unneeded-paddingNick Bradbury
Remove unneeded padding
2016-09-28Remove unneeded padding in invites role dropdownStefanos Togkoulidis
2016-09-28Revert "Fixed commit issue"Stefanos Togkoulidis
This reverts commit dfa97d9865fdabab86708ccb96bf41fff98f02e1.
2016-09-28Merge pull request #4548 from nawabhussain/feature/Role_Selection_DropdownStefanos Togoulidis
Feature/role selection dropdown
2016-09-27Merge branch 'develop' into feature/Role_Selection_DropdownNawab Hussain
2016-09-27Merge pull request #4569 from wordpress-mobile/issue/4568-remove-buck-filesStefanos Togoulidis
fix #4568 remove buck files
2016-09-27Added gradle.properties-exampleNawab
2016-09-27Fixed commit issueNawab
2016-09-27Remove BUCK config filesMaxime Biais
2016-09-27Remove BUCK references in the READMEMaxime Biais
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-26Merge pull request #4537 from ↵mzorz
wordpress-mobile/issue/4523-comment-pn-actions-context-aware Issue/4523 comment pn actions context aware
2016-09-26literals extracted to string constants for readability/reuseMario Zorz
2016-09-26changed var name to fit code style for local varsMario Zorz