Commit graph

552 commits

Author SHA1 Message Date
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
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
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
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
Yusuke Matsubara
08e6743869 Merge branch 'master' into tidySettings 2017-05-14 20:57:01 +09: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
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
Adam Jones
87fe6cf585 Create untranslatable strings for pref constants 2017-05-10 22:51:19 +01:00
Adam Jones
2b91abed22 Hardcode arrays.xml values 2017-05-09 19:59:42 +01:00
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
Adam Jones
0fe7a05731 Create SettingsFragment 2017-04-02 16:37:46 +01:00
Nicolas Raoul
7454051bd2 Fixed URL 2017-03-30 15:51:16 +09:00
Josephine Lim
b64c77021b Merge pull request #451 from maskaravivek/credits
Add credits in about page
2017-03-21 22:11:44 +10:00
veyndan
8cc51c4dd9 Extend from AppCompatActivity instead of Activity 2017-03-20 21:14:22 +00:00
maskara
6b1484efe6 Add credits in about page 2017-03-21 01:22:04 +05:30
Neslihan
86c24817b1 Use ?attr/mainBackground instead 2017-03-18 12:28:55 +03:00
Neslihan
e094101e58 Apply reviews 2017-03-18 12:04:49 +03:00
Neslihan
85d0ce2c30 Fix details backgorund for both of themes 2017-03-18 11:50:53 +03:00
Neslihan
7e256175dc Move theme checkbox to settings activity 2017-03-18 01:49:19 +03:00
neslihanturan
c7909b4f66 Merge pull request #1 from domdomegg/addThemeToggle
Use blue light theme
2017-03-17 11:45:50 +02:00
Adam Jones
d24fd5e3d0 Use a white triangle for dropdown 2017-03-16 22:21:02 +00:00
Adam Jones
2fe21253b4 Use blue light theme 2017-03-16 21:17:23 +00:00
Neslihan
9cc574c697 Force upload activity to has always DarkTheme to make it readable 2017-03-16 19:11:49 +03:00
Neslihan
65753550e3 Add (black)Material icons for light theme 2017-03-16 16:55:18 +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
Neslihan
5147769405 Add BaseActivity and BaseAppcompatActivity 2017-03-15 18:20:59 +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