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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									addshore 
								
							 
						 
						
							
							
							
							
								
							
							
								1a288176bb 
								
							 
						 
						
							
							
								
								Cleanup WikiAccountAuthenticator logic  
							
							 
							
							... 
							
							
							
							Some of this logic comes from the wikipedia app,
and basically makes sure that we return 'nice' objects
everywhere rather than lots of null.
There is one note left in the class about the getAuthTokenLabel
method and the fact that we should probably return something
there 
							
						 
						
							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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									neslihanturan 
								
							 
						 
						
							
							
							
							
								
							
							
								1d0dad9e1a 
								
							 
						 
						
							
							
								
								Merge pull request  #575  from maskaravivek/crashFix  
							
							 
							
							... 
							
							
							
							Fix Crash issue when GPS location is not available 
							
						 
						
							2017-05-14 16:00:02 +03:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Neslihan 
								
							 
						 
						
							
							
							
							
								
							
							
								e79d18f439 
								
							 
						 
						
							
							
								
								Fix codacy  
							
							 
							
							
							
						 
						
							2017-05-14 15:59:00 +03:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Neslihan 
								
							 
						 
						
							
							
							
							
								
							
							
								dc1b04f3ed 
								
							 
						 
						
							
							
								
								Switch map button accoding to map and list  
							
							 
							
							
							
						 
						
							2017-05-14 15:51:50 +03:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									maskara 
								
							 
						 
						
							
							
							
							
								
							
							
								fd72e45930 
								
							 
						 
						
							
							
								
								Fix Crash issue when GPS location is not available  
							
							 
							
							
							
						 
						
							2017-05-14 14:42:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dinu Kumarasiri 
								
							 
						 
						
							
							
							
							
								
							
							
								c426451ffb 
								
							 
						 
						
							
							
								
								Fix Codecy Failures  
							
							 
							
							
							
						 
						
							2017-05-14 14:41:42 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								a8c950dee9 
								
							 
						 
						
							
							
								
								Restore comments  
							
							 
							
							
							
						 
						
							2017-05-14 21:01:26 +09: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tobias Schönberg 
								
							 
						 
						
							
							
							
							
								
							
							
								e299536c8a 
								
							 
						 
						
							
							
								
								Code style  
							
							 
							
							
							
						 
						
							2017-05-14 10:00:17 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dinu Kumarasiri 
								
							 
						 
						
							
							
							
							
								
							
							
								7050efc996 
								
							 
						 
						
							
							
								
								Fix Codecy Failures  
							
							 
							
							... 
							
							
							
							Fix Codecy Failures
Fix Codecy Failures 
							
						 
						
							2017-05-14 00:03:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dinu Kumarasiri 
								
							 
						 
						
							
							
							
							
								
							
							
								28ca9ec394 
								
							 
						 
						
							
							
								
								Apply the upload limit  
							
							 
							
							
							
						 
						
							2017-05-13 17:30:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dinu Kumarasiri 
								
							 
						 
						
							
							
							
							
								
							
							
								6feed8cab1 
								
							 
						 
						
							
							
								
								Add a new preference to set the upload limit  
							
							 
							
							
							
						 
						
							2017-05-13 17:24:02 +02:00