Paul Hawke
								
							 
						 | 
						
							
							
							
							
								
							
							
								9927879680
								
							
						 | 
						
							
							
								
								Injected the ContributionDao where needed.
							
							
							
							
							
						 | 
						
							2018-01-05 08:34:48 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Hawke
								
							 
						 | 
						
							
							
							
							
								
							
							
								f2ed57a127
								
							
						 | 
						
							
							
								
								Moved Category and CategoryDao to the 'category' package
							
							
							
							
							
						 | 
						
							2018-01-05 08:34:48 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Hawke
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d3befcbd2
								
							
						 | 
						
							
							
								
								Injected the CategoryDao where needed.
							
							
							
							
							
						 | 
						
							2018-01-05 08:34:48 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Hawke
								
							 
						 | 
						
							
							
							
							
								
							
							
								08673c91c6
								
							
						 | 
						
							
							
								
								Extracted and tested the database interactions from ModifierSequence
							
							
							
							
							
						 | 
						
							2018-01-04 13:27:55 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Hawke
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ba8e93346
								
							
						 | 
						
							
							
								
								Extracted and tested the database interactions from Category
							
							
							
							
							
						 | 
						
							2018-01-04 08:33:40 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									neslihanturan
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6749c43740
								
							
						 | 
						
							
							
								
								Merge pull request #1035 from psh/better-marker-selection-tracking
							
							
							
							
							
							
							
							Direct nearby uploads feature branch - Map marker selection and footer visibility now track together. 
							
						 | 
						
							2018-01-04 16:29:48 +03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								42517bcb7a
								
							
						 | 
						
							
							
								
								Fix more whitespace
							
							
							
							
							
						 | 
						
							2018-01-02 21:54:09 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								9372a7ea3c
								
							
						 | 
						
							
							
								
								Fix whitespace
							
							
							
							
							
						 | 
						
							2018-01-02 21:44:39 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed395a5af5
								
							
						 | 
						
							
							
								
								Add comments
							
							
							
							
							
						 | 
						
							2018-01-02 21:41:23 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								0401eb781c
								
							
						 | 
						
							
							
								
								Add check in SingleUploadFragment for isNearbyUploadf
							
							
							
							
							
						 | 
						
							2018-01-02 21:38:01 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								b719491dcf
								
							
						 | 
						
							
							
								
								Pass nearby Title and Desc to SingleUploadFragment
							
							
							
							
							
						 | 
						
							2018-01-02 21:33:10 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								565e61c0d1
								
							
						 | 
						
							
							
								
								Tidy up and create framework for autofilling EditText
							
							
							
							
							
						 | 
						
							2018-01-02 21:22:09 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ccb0c87b5f
								
							
						 | 
						
							
							
								
								Change to getSharedPreferences to pass prefs between activities
							
							
							
							
							
						 | 
						
							2018-01-02 21:15:04 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef3eda7d10
								
							
						 | 
						
							
							
								
								Create boolean for isDirectUpload and pass shared prefs to ShareActivity.java
							
							
							
							
							
						 | 
						
							2018-01-02 21:01:00 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									neslihanturan
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d6d38e0564
								
							
						 | 
						
							
							
								
								Merge pull request #1026 from psh/extract-and-test-contribution-db
							
							
							
							
							
							
							
							Extracted and tested the database interactions from Contribution. 
							
						 | 
						
							2018-01-02 13:58:10 +03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								8db3d55fa0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/commons-app/directNearbyUploads' into nearby-uploads
							
							
							
							
							
							
							
							# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java 
							
						 | 
						
							2018-01-02 18:27:15 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									neslihanturan
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e630e22e0c
								
							
						 | 
						
							
							
								
								Merge pull request #981 from maskaravivek/removeCsv
							
							
							
							
							
							
							
							Remove CSV option for nearby places 
							
						 | 
						
							2018-01-01 19:08:55 +03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e056a412f
								
							
						 | 
						
							
							
								
								Add TODO
							
							
							
							
							
						 | 
						
							2018-01-01 21:10:28 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								443acab313
								
							
						 | 
						
							
							
								
								Image handling now works
							
							
							
							
							
						 | 
						
							2018-01-01 21:00:28 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dde0319a0
								
							
						 | 
						
							
							
								
								Implement onActivityResult() in map fragment
							
							
							
							
							
						 | 
						
							2018-01-01 20:56:37 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								792cc2c4c7
								
							
						 | 
						
							
							
								
								Fix build error
							
							
							
							
							
						 | 
						
							2018-01-01 20:43:25 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								96b822aa5d
								
							
						 | 
						
							
							
								
								Use stored fragment for requesting permissions
							
							
							
							
							
						 | 
						
							2018-01-01 20:43:12 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								804b850d7e
								
							
						 | 
						
							
							
								
								Save fragment as instance variable
							
							
							
							
							
						 | 
						
							2018-01-01 20:41:35 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								b76ecf74f8
								
							
						 | 
						
							
							
								
								Switch to uploading from gallery
							
							
							
							
							
						 | 
						
							2018-01-01 20:28:41 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								946c6c740d
								
							
						 | 
						
							
							
								
								Complete initiateDirectUpload()
							
							
							
							
							
						 | 
						
							2018-01-01 20:23:51 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								da5e20a547
								
							
						 | 
						
							
							
								
								Create ContributionController object
							
							
							
							
							
						 | 
						
							2018-01-01 20:19:25 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdcf41e88b
								
							
						 | 
						
							
							
								
								Create initiateUpload() method
							
							
							
							
							
						 | 
						
							2018-01-01 20:16:05 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								009df16f3e
								
							
						 | 
						
							
							
								
								Move direct uploading code to DirectUpload class
							
							
							
							
							
						 | 
						
							2018-01-01 20:05:15 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Xiang Fan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba96a97785
								
							
						 | 
						
							
							
								
								UploadController: add javadoc
							
							
							
							
							
						 | 
						
							2018-01-01 16:10:48 +07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Xiang Fan
								
							 
						 | 
						
							
							
							
							
								
							
							
								24679f7322
								
							
						 | 
						
							
							
								
								LocationServiceManager: add javadoc
							
							
							
							
							
						 | 
						
							2018-01-01 16:10:48 +07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Xiang Fan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad5372e38b
								
							
						 | 
						
							
							
								
								DialogUtil: add javadoc
							
							
							
							
							
						 | 
						
							2018-01-01 16:10:48 +07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Xiang Fan
								
							 
						 | 
						
							
							
							
							
								
							
							
								7118234ebf
								
							
						 | 
						
							
							
								
								MediaWikiImageView: add javadoc
							
							
							
							
							
						 | 
						
							2018-01-01 16:10:48 +07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								8200d808d7
								
							
						 | 
						
							
							
								
								Add TODO for List
							
							
							
							
							
						 | 
						
							2017-12-31 22:15:04 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e214bdabd
								
							
						 | 
						
							
							
								
								Retrieve shared preferences for image name and desc
							
							
							
							
							
						 | 
						
							2017-12-31 19:06:44 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5a18ce948
								
							
						 | 
						
							
							
								
								Insert image name and desc into shared preference
							
							
							
							
							
						 | 
						
							2017-12-31 19:03:08 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								9888dc3476
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/commons-app/directNearbyUploads' into nearby-uploads
							
							
							
							
							
						 | 
						
							2017-12-31 18:33:54 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								e979d88aef
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/origin/master' into directNearbyUploads
							
							
							
							
							
						 | 
						
							2017-12-31 17:22:55 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Hawke
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5d914051c
								
							
						 | 
						
							
							
								
								Map marker selection and footer visibility now track together.
							
							
							
							
							
						 | 
						
							2017-12-30 17:16:45 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								c001da38ed
								
							
						 | 
						
							
							
								
								Remove TODO
							
							
							
							
							
						 | 
						
							2017-12-31 02:34:56 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd9976cfff
								
							
						 | 
						
							
							
								
								Rename Description to Label to prevent misunderstandings
							
							
							
							
							
						 | 
						
							2017-12-31 02:34:36 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								36ec230506
								
							
						 | 
						
							
							
								
								Remove TODO
							
							
							
							
							
						 | 
						
							2017-12-31 02:24:39 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								548e2a7ab8
								
							
						 | 
						
							
							
								
								Rename Description to Label
							
							
							
							
							
						 | 
						
							2017-12-31 02:21:55 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca35b5e544
								
							
						 | 
						
							
							
								
								Return longDescription instead of description
							
							
							
							
							
						 | 
						
							2017-12-31 02:08:11 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								b27163906b
								
							
						 | 
						
							
							
								
								Replace anonymous inner classes with lambdas
							
							
							
							
							
						 | 
						
							2017-12-31 01:17:12 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								152fca30d3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/commons-app/directNearbyUploads' into nearby-uploads
							
							
							
							
							
						 | 
						
							2017-12-31 01:01:44 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea0d3f75eb
								
							
						 | 
						
							
							
								
								Edit TODO
							
							
							
							
							
						 | 
						
							2017-12-31 00:46:56 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a92ec64df
								
							
						 | 
						
							
							
								
								Modify getDescription to fix "?" desc bug
							
							
							
							
							
						 | 
						
							2017-12-31 00:43:53 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								da63f31017
								
							
						 | 
						
							
							
								
								Put logs in onClick()
							
							
							
							
							
						 | 
						
							2017-12-31 00:40:04 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								1fe7b4842d
								
							
						 | 
						
							
							
								
								Add getters for name and description of Place
							
							
							
							
							
						 | 
						
							2017-12-31 00:36:51 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									misaochan
								
							 
						 | 
						
							
							
							
							
								
							
							
								c70eec650c
								
							
						 | 
						
							
							
								
								Add onClickListeners for camera and gallery FAB
							
							
							
							
							
						 | 
						
							2017-12-31 00:22:19 +10:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |