Commit graph

276 commits

Author SHA1 Message Date
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
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
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
addshore
ea051c119a Add 2fa to login activity
Fixes #328
2017-05-14 15:19:57 +02:00
Dinu Kumarasiri
d1fc670b19 Fix the issue of not reloading the cursor after the setting changed 2017-05-14 14:33:19 +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
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
addshore
e8bbbe78d8 Detect when 2FA is needed and error nicely
Fixes #507
2017-05-13 12:03:40 +02:00
Udit
a5dc7f79c1 Fix - zero quantity in messages doesn't work in English #343 (#546) 2017-05-12 22:31:13 +09:00
neslihanturan
d5f50e8626 Merge pull request #553 from maskaravivek/mapView
Added support for MapView in Nearby
2017-05-12 16:02:59 +03:00
maskara
6118b57295 Added support for MapView in Nearby 2017-05-12 13:50:25 +02:00
srv-twry
5639be077e Plural declarations in the strings resource file now according to guidelines 2017-05-11 04:01:06 +05:30
Yusuke Matsubara
8731987385 Generate Nearby list using Wikidata Query
Plus,
* remove duplicate location service manager
* add option to switch data sources of Nearby
* faster sorting of places
* minor coding style improvents
2017-04-14 17:38:45 +09:00
Nicolas Raoul
7454051bd2 Fixed URL 2017-03-30 15:51:16 +09:00
maskara
6b1484efe6 Add credits in about page 2017-03-21 01:22:04 +05:30
Neslihan
e094101e58 Apply reviews 2017-03-18 12:04:49 +03:00
Neslihan
7e256175dc Move theme checkbox to settings activity 2017-03-18 01:49:19 +03:00
Neslihan
1df98efb27 Merge remote-tracking branch 'upstream/master' into addThemeToggle 2017-03-16 15:19:58 +03:00
Neslihan
23aa691275 Prepare xml files 2017-03-15 18:58:57 +03:00
nextLane
c6352a3792 Merged, Resolve merge conflicts 2017-03-13 23:06:42 +05:30
maskara
3561997728 Updated title and description for beta link 2017-03-12 20:03:03 +05:30
maskara
18f1ccb563 Add beta opt in link in settings page 2017-03-12 19:51:51 +05:30
nextLane
f2a3c5ff24 Adding refresh UI 2017-03-12 00:25:04 +05:30
Neslihan
87e1ffd234 Fix Lint errors/warnings - HardcodedText: Hardcoded text 2017-03-11 12:13:52 +03:00
maskara
8f6a201d35 Fixes #144: Add CC 4.0 to license options 2017-03-05 03:44:04 +05:30
Josephine Lim
d68897f3fa Fix new-line formatting in tutorial strings 2017-02-28 01:25:56 +10:00
jhsoby
dd960ae8d9 removing duplicate </a> 2016-12-24 14:58:26 +01:00
Niklas Laxström
88eec03892 Localisation updates from https://translatewiki.net. 2016-12-22 07:34:20 +01:00
misaochan
2d200a2dbf Add long form of desc 2016-12-15 21:15:02 +13:00
Josephine Lim
7e521c48a7 Merge pull request #344 from amire80/slash
Rephrase bug reports and suggestions without slash
2016-12-15 20:39:05 +13:00
Josephine Lim
9a28eacc7e Merge pull request #342 from amire80/sp
Remove unnecessary whitespace from an English translatable string
2016-12-15 20:34:59 +13:00
Amire80
72b22e8a18 Rephrase bug reports and suggestions without slash
This looks more natural in English.
2016-12-15 09:28:41 +02:00
Amire80
908c7460de Remove unnecessary whitespace from an English translatable string 2016-12-15 09:10:43 +02:00
Amire80
6c0d8f68c9 Rephrase a translatable string without comma splice 2016-12-15 09:09:45 +02:00
misaochan
9a27f2b94c Fix whitespace issues 3 2016-12-15 16:46:21 +13:00
misaochan
bd5c5278e0 Fix whitespace issues 2 2016-12-15 16:45:20 +13:00
misaochan
b4b5729235 Fix whitespace issues 2016-12-15 16:43:53 +13:00
misaochan
fd36caace9 Remove escaped chars 2016-12-15 16:17:29 +13:00
misaochan
dcecf607ef Add string resources 2016-12-15 15:36:22 +13:00
misaochan
b50a75ac89 Edit strings for Sydney Opera House 2016-12-03 18:51:26 +13:00
misaochan
e7b5ecc974 Modify strings for Page 4 2016-11-29 22:04:23 +13:00
misaochan
765e646d74 Set text fields for Page 4 2016-11-29 21:26:27 +13:00