Commit graph

902 commits

Author SHA1 Message Date
neslihanturan
1a1fc143c9 Merge pull request #608 from maskaravivek/minorFix
Fixes #587: Remove trailing carriage return
2017-05-16 15:39:56 +03:00
maskara
a4c1087abb Fixed codacy issue 2017-05-16 13:31:21 +02:00
maskara
63937a842a Add navigation drawer to Share and Multi Share activity 2017-05-16 13:24:39 +02:00
maskara
583a47e2b4 Fixes #587: Remove trailing carriage return 2017-05-16 13:11:54 +02:00
maskara
ddd5e602a9 Fixed nearby query to show read article link only for wikipedia articles 2017-05-16 12:46:05 +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
Yusuke Matsubara
04ea68333b Print radius with a limited number of digits + reduce debug output 2017-05-16 12:40:48 +09:00
Yusuke Matsubara
a794485ab1 Merge pull request #598 from tobias47n9e/master
Change file extension of nearby query to .rq
2017-05-16 12:10:25 +09:00
Tobias Schönberg
14024601fc Change file extension of nearby query to .rq
Currently the file uses .txt which breaks syntax highlighting
one some platforms. This is also the file extension recommendet
in the standard:
https://www.w3.org/TR/2010/WD-sparql11-federated-query-20100601/

Changes to be committed:
	renamed:    src/main/assets/queries/nearby_query.txt -> src/main/assets/queries/nearby_query.rq
	modified:   src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
2017-05-15 20:06:40 +02:00
Adam Jones
c03957368c Update github.com/wikimedia -> github.com/commons-app 2017-05-15 16:49:03 +01:00
Josephine Lim
706c971d91 Merge pull request #595 from sandarumk/nearby_description_issue
Set default text when no description found
2017-05-15 17:28:34 +02:00
Josephine Lim
37c3004b57 Merge pull request #594 from maskaravivek/stetho
Making debugging easier with stetho
2017-05-15 17:04:39 +02:00
Dinu Kumarasiri
dfe3ff5dfe Set default text when no description found 2017-05-15 17:04:06 +02:00
addshore
06b93dd7cf Merge pull request #593 from sandarumk/label_space_issue_in_nearby
Fixes #508
2017-05-15 16:53:27 +02:00
maskara
c49720c777 Making debugging easier with stetho 2017-05-15 16:51:44 +02:00
Dinu Kumarasiri
653b5ce57a Fix #508 2017-05-15 16:48:02 +02:00
addshore
367228d758 Switch the main activity to be the LoginActivity 2017-05-15 16:34:54 +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
Josephine Lim
391a3d38b8 Versioning 2017-05-15 12:28:05 +02:00
Dinu Kumarasiri
8bf59d832f Tidy about screen 2017-05-15 12:21:32 +02:00
Josephine Lim
aa4d2daf48 Move checkGps() to onResume 2017-05-15 12:11:06 +02:00
Josephine Lim
b377f0146c Add string resource 2017-05-15 12:10:19 +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
a2a2589df3 Fix codecy failures 2017-05-15 11:32:48 +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
d0622d14b1 Display toast if no nearby places found 2017-05-15 11:18: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
0809290a62 Fix whitespace 2017-05-15 10:54:13 +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
42e975c19c Added logs 2017-05-15 10:49:45 +02:00
Josephine Lim
ad7c1cc8f5 Use requestCode instead 2017-05-15 10:47:02 +02:00
Josephine Lim
0af03bb456 Refresh view if settings changed 2017-05-15 10:39:56 +02:00
Josephine Lim
faa60dc824 Add string resources 2017-05-15 10:25:40 +02:00
Josephine Lim
e8f306a023 Add Dialog if GPS not enabled 2017-05-15 10:11:03 +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
Dinu Kumarasiri
bb5776c59d Set initial load limit to 500 2017-05-14 16:16:29 +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
Josephine Lim
5ed7755a2c Merge pull request #576 from neslihanturan/switchMapIcon
Switch map icon
2017-05-14 15:23:57 +02:00
addshore
eb58a847b1 Create AccountUtil class 2017-05-14 15:19:57 +02:00
addshore
a1d8008901 Refactoring in LoginActivity 2017-05-14 15:19:57 +02:00