InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	Provide reference to BrightnessController in DisplayApp	Reinhold Gschweicher	2022-02-19	1	-0/+2
*	Improved alarm alert handling	Riku Isokoski	2022-02-13	1	-1/+1
*	Added alarm 12 hour interface	Eli Weiss	2022-01-31	1	-2/+2
*	Added 12 hour set time	Eli Weiss	2022-01-31	1	-1/+1
*	Merge pull request #903 from Riksu9000/improved_notif_timeout	JF	2022-01-26	1	-2/+2
\|\
\| *	Improved notification timeout	Riku Isokoski	2022-01-01	1	-2/+2
* \|	Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekb...	Jean-François Milants	2022-01-04	1	-0/+5
\|\ \
\| * \|	Better Sensitivity UI, Calibration button added	Tim Keller	2022-01-04	1	-1/+1
\| * \|	Add start of settings app for senstivity.	Tim Keller	2022-01-04	1	-0/+5
\| \|/
* \|	resolve conflicts	SteveAmor	2022-01-02	1	-3/+0
* \|	resolves conflicts	SteveAmor	2022-01-02	1	-11/+45
\|\\|
\| *	Merge pull request #718 from kieranc/pts-settings	JF	2021-12-30	1	-9/+4
\| \|\
\| \| *	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-12-09	1	-1/+11
\| \| \|\
\| \| * \	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-12-05	1	-7/+13
\| \| \|\ \
\| \| * \| \|	Close menu with button	Riku Isokoski	2021-11-13	1	-4/+4
\| \| * \| \|	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-11-07	1	-0/+14
\| \| \|\ \ \
\| \| * \ \ \	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-10-23	1	-1/+1
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-10-18	1	-4/+25
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Remove old PineTimeStyle settings app	Kieran Cawthray	2021-10-03	1	-5/+0
\| * \| \| \| \| \| \|	FIX: AlarmTriggered fall through to ShowPairingKey	James A. Jerkins	2021-12-11	1	-0/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Style improvements	Avamander	2021-12-09	1	-1/+2
\| * \| \| \| \| \|	Fix for passkey screen scramble	James A. Jerkins	2021-12-09	1	-3/+3
\| * \| \| \| \| \|	Connect and bond with a passkey	James A. Jerkins	2021-12-09	1	-0/+9
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo...	Jean-François Milants	2021-12-02	1	-1/+1
\| \|\ \ \ \ \
\| \| * \| \| \| \|	color rotation using modulo, ran clang-format for InfiniPaint	Clemens von Molo	2021-11-01	1	-1/+1
\| \| * \| \| \| \|	InfiniPaint vibrate on colorchange, fix color rotation	Clemens von Molo	2021-10-31	1	-1/+1
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTi...	Jean-François Milants	2021-11-28	1	-5/+5
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Update includes to to be relative to src directory	Reinhold Gschweicher	2021-11-15	1	-5/+5
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * / \| \| \|	Fix animation when long pressing on screens adjacent to watch face	Riku Isokoski	2021-11-10	1	-1/+7
\| \|/ / / /
\| * / / /	Newer buttonhandler	Riku Isokoski	2021-10-25	1	-0/+14
\| \|/ / /
* \| \| \|	resolves conflicts	SteveAmor	2022-01-02	1	-5/+0
* \| \| \|	Chimes option	SteveAmor	2021-11-07	1	-0/+8
\|/ / /
* \| \|	Merge pull request #740 from Riksu9000/flashlight_brightness	JF	2021-10-23	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Flashlight brightness control	Riku Isokoski	2021-10-13	1	-1/+1
* \| \|	Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime i...	Jean-François Milants	2021-10-10	1	-4/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-10-05	1	-20/+4
\| \|\\|
\| * \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-18	1	-0/+13
\| \|\ \
\| * \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-14	1	-7/+6
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-28	1	-41/+29
\| \|\ \ \ \
\| * \| \| \| \|	Automatic error detection	Riku Isokoski	2021-08-18	1	-3/+14
\| * \| \| \| \|	Fix after merge	Riku Isokoski	2021-08-17	1	-1/+1
\| * \| \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-17	1	-40/+58
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-07-15	1	-3/+5
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Update touchpad driver	Riku Isokoski	2021-07-14	1	-2/+2
* \| \| \| \| \| \| \|	Merge with develop and fix conflicts from timaios:set-datetime-manually.	Jean-François Milants	2021-10-10	1	-0/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'JF002:develop' into set-datetime-manually	Tim	2021-08-08	1	-40/+66
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added new screens to DisplayApp.cpp	timaios	2021-07-09	1	-0/+10
* \| \| \| \| \| \| \| \|	Merge pull request #623 from Riksu9000/lvgl_queuetimeout	JF	2021-10-03	1	-20/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Let lvgl control queueTimeout	Riku Isokoski	2021-08-29	1	-20/+4
* \| \| \| \| \| \| \| \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	1	-6/+0
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|