Commit graph

2447 commits

Author SHA1 Message Date
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
Josephine Lim
27682433ac Merge pull request #599 from whym/nearby
Print radius with a limited number of digits + reduce debug output
2017-05-16 11:04:14 +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
Yusuke Matsubara
d4c9e49305 Merge pull request #597 from domdomegg/bulktranslationfixes
Update github.com/wikimedia -> github.com/commons-app
2017-05-16 12:10:00 +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
Adam Jones
8e3e8982c7 Android correctness lint issues 2017-05-15 16:45:46 +01:00
Adam Jones
876b299ecc Remove redudant local variables 2017-05-15 16:45:46 +01:00
Adam Jones
75060d7875 Removing unused imports 2017-05-15 16:45:46 +01:00
Adam Jones
11e4fae297 Update deprecated values 2017-05-15 16:45:46 +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
681a049369 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-15 17:08:13 +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
Josephine Lim
9f58c519e1 Merge pull request #592 from commons-app/prehackMainActivityIsLoginActivity
Switch the main activity to be the LoginActivity
2017-05-15 16:51:38 +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
8fcc02b46f Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-15 14:08:57 +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
f85970b6e8 Merge pull request #585 from misaochan/master
Versioning and changelog for v2.3
2017-05-15 12:38:17 +02:00
Josephine Lim
1b07f79907 Merge branch 'master' of https://github.com/misaochan/apps-android-commons 2017-05-15 12:35:37 +02:00
Josephine Lim
6cc64943b0 Update changelog.md 2017-05-15 12:33:35 +02:00
Josephine Lim
6934c7e8ce Update changelog.md 2017-05-15 12:33:19 +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
89cb6c4997 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-15 12:20:05 +02:00
Josephine Lim
4450917f5c Merge pull request #583 from misaochan/minor-gps-changes
Put checkGps() in onResume
2017-05-15 12:15:38 +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
7947087280 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-15 12:09:15 +02:00
Josephine Lim
ad815c9910 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-15 12:05:49 +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
Josephine Lim
b71fd5c960 Merge pull request #579 from misaochan/check-gps-2
Check for GPS when Nearby is loaded
2017-05-15 11:05:25 +02:00
Josephine Lim
9e17405b92 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-15 10:57:15 +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