Commit graph

2759 commits

Author SHA1 Message Date
Paul Hawke
f9ff29000b Rolled back change to targetSdkVersion, back to 25 as Travis seems to need right now. 2017-10-10 22:14:39 -05:00
Paul Hawke
accd7edb7d Merge branch 'master' into login-screen-improvement 2017-10-10 22:13:25 -05:00
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
Paul Hawke
d6873cfad4 Merge pull request #898 from mashawan/master
Implement List or map: remember last used #649
2017-10-10 21:52:22 -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
dd06c11f19 Merge branch 'about-activity-update' of https://github.com/misaochan/apps-android-commons into about-activity-update 2017-10-11 00:33:23 +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
Josephine Lim
4db143946b Merge pull request #904 from misaochan/master
Fix failed Travis build caused by faulty string
2017-10-11 00:27:40 +10:00
Vishan Seru
6b96b65203 Synced branch to master 2017-10-10 19:51:29 +05:30
misaochan
7b5d2bff12 Modify privacy policy URL 2017-10-11 00:10:43 +10:00
misaochan
62eab6299e Replace About text with version drafted by WMF lawyer 2017-10-11 00:09:15 +10:00
misaochan
3417085c1f Merge branch 'master' of https://github.com/misaochan/apps-android-commons 2017-10-10 23:55:12 +10:00
misaochan
8ba0fa9131 Fix failing Travis build 2017-10-10 23:55:04 +10:00
misaochan
fe60905331 Fix failing Travis build 2017-10-10 23:54:33 +10:00
misaochan
2fc5a78f62 Merge branch 'master' of https://github.com/misaochan/apps-android-commons 2017-10-10 23:48:36 +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
Josephine Lim
f44fc4676a Merge pull request #900 from thedeadline/master
Add adaptive icon foreground and background designs
2017-10-10 22:58:29 +10:00
Isabelle Giuong
f86916ab8c Add Commons SVG logo file 2017-10-10 01:08:21 -05:00
Isabelle Giuong
acdf4a2aee Delete Adaptive Icon video file 2017-10-10 00:13:17 -05:00
Paul Hawke
bcf6511d13 Merge branch 'master' into login-screen-improvement 2017-10-09 21:40:30 -05:00
Paul Hawke
e416a0f48d Simplified the style.xml to remove items that remain constant across day/night mode. 2017-10-09 18:47:44 -05:00
misaochan
bd568e3519 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-10-09 17:01:32 +10:00
translatewiki.net
5c25104017 Localisation updates from https://translatewiki.net. 2017-10-09 08:23:58 +02:00
Isabelle Giuong
c65486014f Add adaptive icon design and demo
Add adaptive icon foreground and background files with short video of what it looks like implemented.
2017-10-08 15:28:58 -05:00
Paul Hawke
cc2bb36560 Code cleanup to make the class more readable, extracted string resource and dealt with warnings. 2017-10-07 16:42:06 -05:00
Paul Hawke
3d0d48745e Better messaging for the user. 2017-10-07 11:10:43 -05:00
Paul Hawke
f55c27a625 Updated theming for the new login screen 2017-10-07 09:37:03 -05: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
0cf3291f19 Merge remote-tracking branch 'origin/master' 2017-10-05 15:58:28 +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
Martin Entwistle
b5ebed9fa0 Method rename. 2017-10-05 15:51:16 +01:00
Martin Entwistle
7740a4b7a0 Introduced a view mode and shared preference to determine which style of view to use. 2017-10-05 14:13:26 +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
Paul Hawke
529f5415c3 Improved the layout of the login screen. 2017-09-30 14:39:26 -05:00
translatewiki.net
d37936f7fe Localisation updates from https://translatewiki.net. 2017-09-29 09:23:14 +02:00
Paul Hawke
e3bf707ea9 Merge branch 'neslihanturan-ftsalamp-master' 2017-09-26 22:35:10 -05:00