Commit graph

1326 commits

Author SHA1 Message Date
Paul Hawke
7e5d8c4c79 Merge pull request #905 from misaochan/about-activity-update
Modify disclaimer in About activity per WMF's request
2017-10-10 22:00:02 -05:00
Martin Entwistle
d45d203840 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivityMode.java
#	app/src/main/res/values-hi/strings.xml
2017-10-10 22:36:20 +01:00
Martin Entwistle
069bca6f22 Refactor based on review comments. 2017-10-10 22:28:47 +01:00
Martin Entwistle
47adcbc5e4 Corrected code style issue. 2017-10-10 22:25:27 +01:00
Martin Entwistle
0b01efa2c3 Corrected code style issues. 2017-10-10 22:25:07 +01:00
Martin Entwistle
276f4dc94b Method rename. 2017-10-10 22:21:40 +01:00
Martin Entwistle
30104af6a0 Introduced a view mode and shared preference to determine which style of view to use. 2017-10-10 22:21:40 +01:00
misaochan
473d5f62a2 Futureproof privacy policy link 2017-10-11 01:34:50 +10:00
Josephine Lim
cfcfcaf194 Merge pull request #866 from Bluesir9/issue_861_nearby_permission_deny_crash_fix
Replaced usage of NoPermissionsFragment with AlertDialog in NearbyActivity
2017-10-11 00:40:02 +10:00
misaochan
9e0a790b8a Modify privacy policy URL 2017-10-11 00:33:17 +10:00
misaochan
dcb9ad0a96 Replace About text with version drafted by WMF lawyer 2017-10-11 00:33:17 +10:00
Vishan Seru
6b96b65203 Synced branch to master 2017-10-10 19:51:29 +05:30
misaochan
8ba0fa9131 Fix failing Travis build 2017-10-10 23:55:04 +10:00
Josephine Lim
044659cd41 Merge pull request #897 from poojithakr/codacy-issues
Fixing codacy issues. Reduced reported count from 550 to 518.
2017-10-10 23:46:10 +10:00
translatewiki.net
5c25104017 Localisation updates from https://translatewiki.net. 2017-10-09 08:23:58 +02:00
Martin Entwistle
84441c17aa Corrected code style issue. 2017-10-06 07:00:37 +01:00
Martin Entwistle
7e777b33b6 Corrected hi strings file. 2017-10-05 23:56:55 +01:00
Martin Entwistle
b49d2b9e8d Corrected code style issues. 2017-10-05 23:36:37 +01:00
Martin Entwistle
d73cbfc8c9 Method rename. 2017-10-05 15:55:30 +01:00
Martin Entwistle
71d6ad1362 Introduced a view mode and shared preference to determine which style of view to use. 2017-10-05 15:55:30 +01:00
translatewiki.net
4b7ead6768 Localisation updates from https://translatewiki.net. 2017-10-05 07:42:24 +02:00
poojithakr
fc9cd0a3b7 Fixing codacy issues. Reduced reported count from 550 to 518. 2017-10-04 00:28:11 -07:00
Nicolas Raoul
9b8d8e9b7c Merge pull request #867 from pszklarska/fix_844
Fixing #844 - If a category has exact name entered, show it first
2017-10-02 16:32:46 +09:00
translatewiki.net
7684826002 Localisation updates from https://translatewiki.net. 2017-10-02 08:27:58 +02:00
translatewiki.net
d37936f7fe Localisation updates from https://translatewiki.net. 2017-09-29 09:23:14 +02:00
Paul Hawke
7dd3dced35 Fixed merge conflicts 2017-09-26 22:33:59 -05:00
translatewiki.net
fece67e0f9 Localisation updates from https://translatewiki.net. 2017-09-25 07:14:07 +02:00
Paul Hawke
c3d6d0eb44 Merge branch 'master' into lint-cleanup 2017-09-23 13:27:07 -05:00
Paul Hawke
f06fcf651f Merge pull request #878 from neslihanturan/bugFix-877
Closes #877
2017-09-22 22:58:03 -05:00
Paul Hawke
13d0a21ff1 Merge pull request #882 from Bluesir9/issue_#881_signup_beta_redirection_correction
Moved sign up process redirection urls to build.gradle
Closes #881
2017-09-22 22:42:54 -05:00
translatewiki.net
e41ef51a31 Localisation updates from https://translatewiki.net. 2017-09-21 09:18:58 +02:00
translatewiki.net
b3a0093c2c Localisation updates from https://translatewiki.net. 2017-09-18 13:14:47 +02:00
Vishan Seru
3b5811921c Moved sign up process redirection urls to build.gradle as buildConfig fields specific to beta and prod flavors and added necessary usages to SignupActivity 2017-09-16 20:12:57 +05:30
translatewiki.net
1253f76e01 Localisation updates from https://translatewiki.net. 2017-09-14 07:15:25 +02:00
Paul Hawke
d4fd6f8b77 Merge branch 'master' into lint-cleanup 2017-09-13 19:16:55 -05:00
neslihanturan
ffc7c80678 Merge pull request #857 from psh/beta-cluster
Product flavors for production and the beta-cluster Wikimedia servers
2017-09-13 10:57:31 +03:00
Neslihan
4d9e63227c Fix codacy issue 2017-09-12 23:14:58 +03:00
Neslihan
c52c0b4a7f Fix coding style 2017-09-12 22:47:57 +03:00
Neslihan
1c50e8539b Request write permission for older android versions, too. 2017-09-12 22:47:31 +03:00
translatewiki.net
c8b0d2cee4 Localisation updates from https://translatewiki.net. 2017-09-11 07:14:33 +02:00
translatewiki.net
3a15f9a1d6 Localisation updates from https://translatewiki.net. 2017-09-07 07:15:24 +02:00
Josephine Lim
9454df7ec9 Merge pull request #864 from psh/round-nearby-icons
Removed grey box background on nearby icons
2017-09-06 15:50:10 +10:00
Josephine Lim
62750de0c1 Merge pull request #756 from veyndan/nearby-list-redesign
Redesign Nearby Places list items
2017-09-06 15:49:46 +10:00
Paul Hawke
b9dbdfb337 Fixed remaining icons missed in the first pass, removing the grey background. 2017-09-05 22:01:36 -05:00
pszklarska
0e2d2c1fcf Fixing Codacy issues 2017-09-05 19:14:58 +02:00
pszklarska
c61414d76e Fixing Codacy issues 2017-09-05 19:08:17 +02:00
pszklarska
0446335bd8 Fixing test not working 2017-09-05 18:29:37 +02:00
pszklarska
8edd90ef50 Fixing Codacy issues 2017-09-05 18:27:16 +02:00
pszklarska
c9ed77f696 Changing method names 2017-09-05 18:13:36 +02:00
pszklarska
228a497125 Code cleanup in build.gradle 2017-09-05 18:03:59 +02:00