InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #507 from Riksu9000/fit_more_tasks	JF	2021-10-16	1	-5/+8
\|\
\| *	Merge branch 'develop' into fit_more_tasks	Riku Isokoski	2021-08-28	28	-447/+306
\| \|\
\| * \	Merge branch 'develop' into fit_more_tasks	Riku Isokoski	2021-07-25	20	-97/+120
\| \|\ \
\| * \| \|	Fix	Riku Isokoski	2021-07-21	1	-2/+1
\| * \| \|	Fit more tasks in SystemInfo	Riku Isokoski	2021-07-21	1	-4/+8
* \| \| \|	Merge pull request #655 from NeroBurner/paddle_hor_fix	JF	2021-10-16	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Paddle: compare ballX coordinate with horizontal resolution	Reinhold Gschweicher	2021-10-11	1	-2/+2
* \| \| \| \|	Replaced "JF002" in github URLs with "InfiniTimeOrg"	mabuch	2021-10-15	2	-2/+3
\|/ / / /
* \| \| \|	Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime i...	Jean-François Milants	2021-10-10	4	-4/+83
\|\ \ \ \
\| * \ \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-10-05	10	-30/+63
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-18	3	-1/+309
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix Error screen and optimize GetTouchInfo	Riku Isokoski	2021-09-15	2	-5/+0
\| * \| \| \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-14	73	-313/+589
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-28	13	-25/+17
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Automatic error detection	Riku Isokoski	2021-08-18	2	-0/+76
\| * \| \| \| \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-17	37	-520/+410
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-07-15	2	-32/+33
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update touchpad driver	Riku Isokoski	2021-07-14	2	-5/+13
* \| \| \| \| \| \| \| \|	Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by nu...	Jean-François Milants	2021-10-10	4	-85/+61
* \| \| \| \| \| \| \| \|	Merge with develop and fix conflicts from timaios:set-datetime-manually.	Jean-François Milants	2021-10-10	5	-5/+455
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'JF002:develop' into set-datetime-manually	Tim	2021-08-08	31	-245/+240
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Code optimizations in SettingSetDate and SettingSetTime	Tim Taenny	2021-07-09	2	-13/+7
\| * \| \| \| \| \| \| \| \| \|	Code optimizations in SettingSetTime	Tim Taenny	2021-07-09	1	-9/+17
\| * \| \| \| \| \| \| \| \| \|	Modified Settings menu as per suggestion	Tim Taenny	2021-07-09	1	-4/+4
\| * \| \| \| \| \| \| \| \| \|	Code optimizations in SettingSetDate	Tim Taenny	2021-07-09	1	-41/+2
\| * \| \| \| \| \| \| \| \| \|	Code optimizations in SettingSetTime	Tim Taenny	2021-07-09	1	-24/+10
\| * \| \| \| \| \| \| \| \| \|	Code optimizations in SettingSetDate	Tim Taenny	2021-07-09	1	-28/+12
\| * \| \| \| \| \| \| \| \| \|	Added new menu entries to Settings page	timaios	2021-07-09	2	-3/+17
\| * \| \| \| \| \| \| \| \| \|	Added new screen: SettingSetDate	timaios	2021-07-09	2	-0/+317
\| * \| \| \| \| \| \| \| \| \|	Added new screen: SettingSetTime	timaios	2021-07-09	2	-0/+212
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #701 from maksalees/close-info-popup-with-back-button-in-a...	JF	2021-10-09	2	-4/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixes based on code reviews	Maxim Leshchenko	2021-09-29	2	-8/+9
\| * \| \| \| \| \| \| \| \| \|	Alarm: Close the popup with information about the time until alarm with the b...	Maxim Leshchenko	2021-09-28	2	-0/+12
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #638 from Riksu9000/detect_full_charge	JF	2021-10-03	7	-22/+59
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Show plug icon while plugged in	Riku Isokoski	2021-09-22	2	-4/+4
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into detect_full_charge	Riku Isokoski	2021-09-22	8	-15/+313
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Use percentage instead of IsFull	Riku Isokoski	2021-09-03	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \|	Auto realign battery icon in Analog watch face	Riku Isokoski	2021-09-03	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \|	Detect full charge and improve watchface display	Riku Isokoski	2021-09-03	7	-23/+59
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #664 from Riksu9000/disable_notif_only	JF002	2021-09-23	2	-7/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into disable_notif_only	Riku Isokoski	2021-09-13	3	-11/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Toggle notifications only, keep vibrations.	Riku Isokoski	2021-09-12	2	-7/+3
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...	JF002	2021-09-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix unsigned/signed comparison warning in Metronome.cpp	Reinhold Gschweicher	2021-09-16	1	-1/+1
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	4	-13/+3
\|\\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #602 from Riksu9000/del_unused	JF002	2021-09-12	2	-9/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Remove unused variables	Riku Isokoski	2021-08-19	2	-9/+1
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #580 from Riksu9000/timer_battery_reading	JF002	2021-09-12	1	-2/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into timer_battery_reading	Riku Isokoski	2021-08-30	73	-302/+590
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-28	18	-141/+131
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \|