Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							1c3372b319 
							
						 
					 
					
						
						
							
							Fix settings merge error  
						
						 
						
						
						
						
					 
					
						2021-10-18 23:29:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							ff1fce18d6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into pts-settings  
						
						 
						
						
						
						
					 
					
						2021-10-18 23:14:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							c4ab17f587 
							
						 
					 
					
						
						
							
							Disable DoubleTap when settings buttons are displayed  
						
						 
						
						
						
						
					 
					
						2021-10-18 23:04:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							1c86796eac 
							
						 
					 
					
						
						
							
							More duplicate color dodging  
						
						 
						
						
						
						
					 
					
						2021-10-18 22:52:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ab7c6e162f 
							
						 
					 
					
						
						
							
							Merge pull request  #752  from carlosperate/mcuboot-url  
						
						 
						
						... 
						
						
						
						Update git URLS, MCUboot is now an independent organisation 
						
						
					 
					
						2021-10-17 21:24:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								carlosperate 
							
						 
					 
					
						
						
						
						
							
						
						
							c4b8ff314a 
							
						 
					 
					
						
						
							
							Update git URLS, MCUboot is now independent w/ different GitHub org.  
						
						 
						
						
						
						
					 
					
						2021-10-17 00:31:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bf83493c8d 
							
						 
					 
					
						
						
							
							Merge pull request  #746  from Quantum-cross/recovery-fix  
						
						 
						
						... 
						
						
						
						fix building of Recovery image 
						
						
					 
					
						2021-10-16 14:11:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8165c8676c 
							
						 
					 
					
						
						
							
							Merge pull request  #652  from dyamon/wake-on-notification  
						
						 
						
						... 
						
						
						
						Make new notifications refresh idle timer 
						
						
					 
					
						2021-10-16 14:11:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							77e73fea32 
							
						 
					 
					
						
						
							
							Merge pull request  #507  from Riksu9000/fit_more_tasks  
						
						 
						
						... 
						
						
						
						Fit more tasks in SystemInfo 
						
						
					 
					
						2021-10-16 14:10:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fafb998b8c 
							
						 
					 
					
						
						
							
							Merge pull request  #655  from NeroBurner/paddle_hor_fix  
						
						 
						
						... 
						
						
						
						Paddle: compare ballX coordinate with horizontal resolution 
						
						
					 
					
						2021-10-16 14:09:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c7abb3dd96 
							
						 
					 
					
						
						
							
							Merge pull request  #747  from mabuch/rename-JF0002-InfiniTimeOrg  
						
						 
						
						... 
						
						
						
						Replaced "JF002" in github URLs with "InfiniTimeOrg" 
						
						
					 
					
						2021-10-16 14:07:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mabuch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d76d9170e 
							
						 
					 
					
						
						
							
							Replaced "JF002" in github URLs with "InfiniTimeOrg"  
						
						 
						
						
						
						
					 
					
						2021-10-15 18:03:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							69ef5bfc8d 
							
						 
					 
					
						
						
							
							Merge pull request  #722  from clemensvonmolo/code-structure-doc  
						
						 
						
						... 
						
						
						
						Add docs for app creation and code structure 
						
						
					 
					
						2021-10-15 17:42:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quantum-cross 
							
						 
					 
					
						
						
						
						
							
						
						
							4a59e544ba 
							
						 
					 
					
						
						
							
							fix building of Recovery image.  
						
						 
						
						
						
						
					 
					
						2021-10-14 23:32:58 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Federico Igne 
							
						 
					 
					
						
						
						
						
							
						
						
							59ce48a3f3 
							
						 
					 
					
						
						
							
							Make new notifications refresh idle timer  
						
						 
						
						
						
						
					 
					
						2021-10-14 21:21:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd4929bfd 
							
						 
					 
					
						
						
							
							Paddle: compare ballX coordinate with horizontal resolution  
						
						 
						
						... 
						
						
						
						Fix the comment as the comparison checks if the ball is at the right
side of the screen.
Compare the x coordinate of the ball with the horizontal resolution of
the screen, instead of the vertical resolution. On the PinePhone this
does make no difference as we have square 240x240 screen. Change it
anyways to be completely correct. 
						
						
					 
					
						2021-10-11 21:46:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							91b2e50252 
							
						 
					 
					
						
						
							
							Merge branch 'Riksu9000-update_touch_driver' into develop  
						
						 
						
						
						
						
					 
					
						2021-10-10 16:49:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							6d0e68d626 
							
						 
					 
					
						
						
							
							Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/displayapp/Apps.h 
						
						
					 
					
						2021-10-10 16:48:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							92aeae73de 
							
						 
					 
					
						
						
							
							Merge branch 'timaios-set-datetime-manually' into develop  
						
						 
						
						
						
						
					 
					
						2021-10-10 16:23:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							f2357b36e5 
							
						 
					 
					
						
						
							
							Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by nullptr and other small cleanings.  
						
						 
						
						
						
						
					 
					
						2021-10-10 16:18:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							7cbd56896a 
							
						 
					 
					
						
						
							
							DateTimeController : remove unused methods and variables.  
						
						 
						
						
						
						
					 
					
						2021-10-10 16:08:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							cf9e149b33 
							
						 
					 
					
						
						
							
							Merge with develop and fix conflicts from timaios:set-datetime-manually.  
						
						 
						
						
						
						
					 
					
						2021-10-10 16:01:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							977faebcb8 
							
						 
					 
					
						
						
							
							Remove call to batteryController.Update(); which was replaced by batteryController.MeasureVoltage().  
						
						 
						
						
						
						
					 
					
						2021-10-09 21:17:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9a831a6fe4 
							
						 
					 
					
						
						
							
							Merge pull request  #715  from hubmartin/gpiote-fix  
						
						 
						
						... 
						
						
						
						Fix GPIOTE not calling ISR when button is held during boot 
						
						
					 
					
						2021-10-09 20:36:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b969272c90 
							
						 
					 
					
						
						
							
							Merge pull request  #719  from Riksu9000/improve_battery_reporting  
						
						 
						
						... 
						
						
						
						Improve battery percentage calculation and reporting 
						
						
					 
					
						2021-10-09 20:11:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c99feeea31 
							
						 
					 
					
						
						
							
							Merge pull request  #728  from hubmartin/charge-wake  
						
						 
						
						... 
						
						
						
						Add wake-up on charge event 
						
						
					 
					
						2021-10-09 20:04:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1d0943bb30 
							
						 
					 
					
						
						
							
							Merge pull request  #729  from InfiniTimeOrg/Avamander-patch-1  
						
						 
						
						... 
						
						
						
						Removed the title prefix from issue template 
						
						
					 
					
						2021-10-09 20:00:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5689898a5a 
							
						 
					 
					
						
						
							
							Merge pull request  #730  from coxtor/patch-1  
						
						 
						
						... 
						
						
						
						Add configuration instructions for Ubuntu devcontainers 
						
						
					 
					
						2021-10-09 19:59:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0ca018b309 
							
						 
					 
					
						
						
							
							Merge pull request  #522  from jonvmey/fix-nav-uuid-docs  
						
						 
						
						... 
						
						
						
						Fix Navigation Service UUID docs 
						
						
					 
					
						2021-10-09 19:58:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f99f71cc6e 
							
						 
					 
					
						
						
							
							Merge pull request  #524  from jonvmey/ble-uuid-c-casts  
						
						 
						
						... 
						
						
						
						Remove unnecessary C-style casts with BLE UUIDs 
						
						
					 
					
						2021-10-09 19:53:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4118f97812 
							
						 
					 
					
						
						
							
							Merge pull request  #701  from maksalees/close-info-popup-with-back-button-in-alarm  
						
						 
						
						... 
						
						
						
						Alarm: Close the popup with information about the time until alarm with the back button 
						
						
					 
					
						2021-10-09 19:50:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							1777b9dee8 
							
						 
					 
					
						
						
							
							Don't measure and notify percentage on charging event.  
						
						 
						
						
						
						
					 
					
						2021-10-09 13:39:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								coxtor 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							516f9de3e4 
							
						 
					 
					
						
						
							
							Add configuration instructions for Ubuntu devcontainers  
						
						 
						
						
						
						
					 
					
						2021-10-08 20:05:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Avamander 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4f7c675ae3 
							
						 
					 
					
						
						
							
							Removed the title prefix  
						
						 
						
						
						
						
					 
					
						2021-10-08 18:38:45 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							98e74a3217 
							
						 
					 
					
						
						
							
							Call also ReloadIdleTimer  
						
						 
						
						
						
						
					 
					
						2021-10-08 17:01:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2241fbf4 
							
						 
					 
					
						
						
							
							Add wake on charge event  
						
						 
						
						
						
						
					 
					
						2021-10-08 16:53:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clemens von Molo 
							
						 
					 
					
						
						
						
						
							
						
						
							c3cc83ae17 
							
						 
					 
					
						
						
							
							More reasonable line lengths in Apps.md and Intro.md  
						
						 
						
						
						
						
					 
					
						2021-10-08 14:59:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clemens von Molo 
							
						 
					 
					
						
						
						
						
							
						
						
							884c89c61c 
							
						 
					 
					
						
						
							
							minor corrections and notice about ui guidelines in docs  
						
						 
						
						
						
						
					 
					
						2021-10-06 18:29:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clemens von Molo 
							
						 
					 
					
						
						
						
						
							
						
						
							f1aae6af49 
							
						 
					 
					
						
						
							
							multiple improvements to code docs  
						
						 
						
						
						
						
					 
					
						2021-10-06 14:30:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							90fdea29b8 
							
						 
					 
					
						
						
							
							Fixed feature request template according to  https://github.com/InfiniTimeOrg/InfiniTime/pull/705#issuecomment-933820293  
						
						 
						
						
						
						
					 
					
						2021-10-05 19:58:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clemens von Molo 
							
						 
					 
					
						
						
						
						
							
						
						
							b2141a9050 
							
						 
					 
					
						
						
							
							advise against unecessary additional tasks in docs  
						
						 
						
						
						
						
					 
					
						2021-10-05 18:55:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clemens von Molo 
							
						 
					 
					
						
						
						
						
							
						
						
							aa83fa2dcf 
							
						 
					 
					
						
						
							
							Add docs for app creation and code structure  
						
						 
						
						
						
						
					 
					
						2021-10-05 15:19:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							f61e88b842 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into update_touch_driver  
						
						 
						
						
						
						
					 
					
						2021-10-05 12:45:03 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9e0a7ddf57 
							
						 
					 
					
						
						
							
							Merge pull request  #705  from dyamon/issue-templates  
						
						 
						
						... 
						
						
						
						Issue templates to tame the wilderness 
						
						
					 
					
						2021-10-04 21:28:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							a9f7153fdf 
							
						 
					 
					
						
						
							
							Improve battery percentage calculation and reporting  
						
						 
						
						... 
						
						
						
						While charging, percentage should only go up, and while discharging,
percentage should only go down. 
						
						
					 
					
						2021-10-04 01:41:38 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							7d1da9f1f9 
							
						 
					 
					
						
						
							
							Remove old PineTimeStyle settings app  
						
						 
						
						
						
						
					 
					
						2021-10-03 21:49:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							3320eae95c 
							
						 
					 
					
						
						
							
							Initial commit  
						
						 
						
						
						
						
					 
					
						2021-10-03 21:49:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							392c7ad2ac 
							
						 
					 
					
						
						
							
							Merge pull request  #714  from InfiniTimeOrg/Avamander-patch-1  
						
						 
						
						... 
						
						
						
						Removed an unnecessary space and some punctuation 
						
						
					 
					
						2021-10-03 20:33:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							9ef1babb9d 
							
						 
					 
					
						
						
							
							Code cleanup  
						
						 
						
						
						
						
					 
					
						2021-10-03 17:03:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							f5725714d1 
							
						 
					 
					
						
						
							
							Call battery controller update  
						
						 
						
						
						
						
					 
					
						2021-10-03 17:00:38 +02:00