Commit graph

314 commits

Author SHA1 Message Date
Vivek Maskara
825cdafe7b Merge pull request #615 from neslihanturan/changeQuestionMark
Change orange irrelevant questionmark
2017-05-16 17:53:08 +02:00
neslihanturan
aec62822fc Merge pull request #613 from maskaravivek/navigationBeautify
With icons in navigation drawer
2017-05-16 18:51:36 +03:00
Neslihan
ce15b677ba Change orange irrelevant questionmark 2017-05-16 18:29:24 +03:00
maskara
c0397858ee With icons in navigation drawer 2017-05-16 17:20:42 +02:00
Neslihan
cce8c27a66 Add logout action 2017-05-16 15:52:05 +03:00
maskara
63937a842a Add navigation drawer to Share and Multi Share activity 2017-05-16 13:24:39 +02:00
maskara
41cb2c9769 Add drawer to settings activity 2017-05-16 11:58:54 +02:00
maskara
a6bbc8a33b With NavigationBaseActivity implemented 2017-05-16 11:58:54 +02:00
maskara
09cd596ff6 Integrated navigation drawer in the contributions activity 2017-05-16 11:57:07 +02:00
maskara
e40d2aabb2 With support for navigation drawer 2017-05-16 11:56:39 +02:00
Adam Jones
c03957368c Update github.com/wikimedia -> github.com/commons-app 2017-05-15 16:49:03 +01:00
addshore
06b93dd7cf Merge pull request #593 from sandarumk/label_space_issue_in_nearby
Fixes #508
2017-05-15 16:53:27 +02:00
Dinu Kumarasiri
653b5ce57a Fix #508 2017-05-15 16:48:02 +02:00
Josephine Lim
364199dcb2 Merge pull request #577 from commons-app/2fa
2fa work
2017-05-15 15:25:24 +02:00
Josephine Lim
97d56fb643 Merge pull request #584 from sandarumk/tidy_about_screen
Tidy about screen - Fixes #539
2017-05-15 14:07:04 +02:00
Dinu Kumarasiri
8bf59d832f Tidy about screen 2017-05-15 12:21:32 +02:00
Josephine Lim
5f4c86c698 Merge pull request #582 from misaochan/display_toast
Display toast if no nearby places found
2017-05-15 12:05:03 +02:00
Josephine Lim
e28db0ec06 Merge pull request #581 from sandarumk/add_upload_date_to_image_detail
Add upload date to the image description
2017-05-15 12:04:54 +02:00
Dinu Kumarasiri
83727e43e6 Add upload date to the image description 2017-05-15 11:27:21 +02:00
Josephine Lim
485a0a1bc3 Merge remote-tracking branch 'refs/remotes/commons-app/master' into display_toast
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
2017-05-15 11:23:10 +02:00
Josephine Lim
4a53db8476 Add string resources 2017-05-15 11:20:53 +02:00
Josephine Lim
9a2ab847e7 Merge pull request #580 from neslihanturan/customMapMarkers
Add custom map marker icons
2017-05-15 11:05:39 +02:00
Neslihan
fc1a04d0e4 Add custom map marker icons 2017-05-15 11:56:40 +03:00
Josephine Lim
b1847c604e Merge remote-tracking branch 'refs/remotes/commons-app/master' into check-gps-2 2017-05-15 10:50:05 +02:00
Josephine Lim
faa60dc824 Add string resources 2017-05-15 10:25:40 +02:00
Dinu Kumarasiri
78ac412b17 Merge branch 'master' into set_upload_limit 2017-05-15 09:53:39 +02:00
Yusuke Matsubara
b0b6e9bfd3 Merge pull request #540 from domdomegg/tidySettings
Remove unused code in settingsFragment
2017-05-15 00:43:57 +09:00
Adam Jones
358c5862b6 Move pref values into newly created keys.xml
Hopefully translatewiki won't try to translate these
2017-05-14 15:53:19 +01:00
addshore
904ea4554e Wrap 2fa auth in DEBUG checks
Currently although you can log in with 2fa things break
after than. All of the auth code needs a bit of love to
sort this out.
2017-05-14 15:51:04 +02:00
Josephine Lim
5ed7755a2c Merge pull request #576 from neslihanturan/switchMapIcon
Switch map icon
2017-05-14 15:23:57 +02:00
addshore
a1d8008901 Refactoring in LoginActivity 2017-05-14 15:19:57 +02:00
addshore
ea051c119a Add 2fa to login activity
Fixes #328
2017-05-14 15:19:57 +02:00
Neslihan
dc1b04f3ed Switch map button accoding to map and list 2017-05-14 15:51:50 +03:00
Dinu Kumarasiri
d1fc670b19 Fix the issue of not reloading the cursor after the setting changed 2017-05-14 14:33:19 +02:00
maskara
198f3daf44 Fix Info dialog width issue 2017-05-14 14:27:42 +02:00
neslihanturan
ec387bf3c3 Merge pull request #572 from maskaravivek/mapInfoClick
Close fragment when tapped on the empty section
2017-05-14 15:25:00 +03:00
Yusuke Matsubara
08e6743869 Merge branch 'master' into tidySettings 2017-05-14 20:57:01 +09:00
maskara
ec0da2f4af Close fragment when tapped on the empty section 2017-05-14 13:53:37 +02:00
Josephine Lim
815837ab91 Merge pull request #567 from sandarumk/set_upload_limit
Set upload limit
2017-05-14 13:52:20 +02:00
Neslihan
bb47332a37 Remove conflicts 2017-05-14 14:26:16 +03:00
maskara
cce8715fad Showing an overlay dialog when a nearby item is tapped 2017-05-14 11:49:25 +02:00
Dinu Kumarasiri
6feed8cab1 Add a new preference to set the upload limit 2017-05-13 17:24:02 +02:00
Dinu Kumarasiri
93b867af4f Change the Title in 'My Uploads' to 'My Recent Uploads' 2017-05-13 17:23:25 +02:00
Tobias Schönberg
c6a2f2c7ea Get coordinate template when parsing image page
Currently the image detail view does not display the
coordinates.
This commit adds the coordinate template to the
parser and displays the results rounded to 4 digits.
2017-05-13 16:09:01 +02:00
Neslihan
0901e67853 Optimise unnecesarry method call 2017-05-13 13:41:53 +03:00
Josephine Lim
a99ae9e8bb Merge pull request #560 from commons-app/prehack2faError
Detect when 2FA is needed and error nicely
2017-05-13 12:28:51 +02:00
addshore
e8bbbe78d8 Detect when 2FA is needed and error nicely
Fixes #507
2017-05-13 12:03:40 +02:00
Vivek Maskara
676583b6ec Merge pull request #558 from neslihanturan/nearbyMap
Nearby map
2017-05-13 09:41:57 +02:00
Neslihan
470ad29380 Fix double click to map icon and refresh icon click 2017-05-12 18:42:02 +03:00
Neslihan
f6ac8fd1a5 Display nearby places on the map 2017-05-12 17:55:21 +03:00