InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #617 from ColinKinloch/wake_up_mode_setting_change	JF002	2021-09-12	1	-1/+1
\|\
\| *	Correct change test for wake up mode setting	Colin Kinloch	2021-08-26	1	-1/+1
* \|	Merge pull request #602 from Riksu9000/del_unused	JF002	2021-09-12	4	-18/+2
\|\ \
\| * \|	Remove unused variables	Riku Isokoski	2021-08-19	4	-18/+2
\| \|/
* \|	Merge pull request #580 from Riksu9000/timer_battery_reading	JF002	2021-09-12	8	-31/+38
\|\ \
\| * \	Merge remote-tracking branch 'upstream/develop' into timer_battery_reading	Riku Isokoski	2021-08-30	80	-313/+686
\| \|\ \
\| * \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-28	35	-350/+406
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	10	-165/+167
\| \|\ \ \ \
\| * \| \| \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	8	-32/+38
* \| \| \| \| \|	Update Settings.cpp	Itai Nelken	2021-09-02	1	-2/+2
* \| \| \| \| \|	Fix notifications that wouldn't auto close when the timeout elapsed (in previ...	Jean-François Milants	2021-08-31	1	-1/+0
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Fix wake on tap/double tap.	Jean-François Milants	2021-08-28	1	-6/+8
* \| \| \| \|	Settings : use enums instead of ints to store colors. Group all PTS settings ...	Jean-François Milants	2021-08-28	8	-116/+144
* \| \| \| \|	Merge pull request #458 from kieranc/pinetimestyle-colorpicker	JF002	2021-08-28	10	-18/+465
\|\ \ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-19	2	-7/+7
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-15	19	-281/+281
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix potential edge case of sidebar being set black	Kieran Cawthray	2021-08-15	1	-1/+1
\| * \| \| \| \| \|	More tidying following review	Kieran Cawthray	2021-08-15	1	-85/+88
\| * \| \| \| \| \|	Avoid setting the sidebar black	Kieran Cawthray	2021-08-15	1	-0/+4
\| * \| \| \| \| \|	Remove duplicate code, minor fixes	Kieran Cawthray	2021-08-15	1	-33/+19
\| * \| \| \| \| \|	Add check for randomise button in case colors clash	Kieran Cawthray	2021-08-15	1	-0/+5
\| * \| \| \| \| \|	Add randomise button to color picker	Kieran Cawthray	2021-08-15	2	-0/+22
\| * \| \| \| \| \|	Tidying	Kieran Cawthray	2021-08-12	1	-1/+0
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-12	12	-210/+80
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-28	28	-196/+260
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Increment settings value, remove old hacky fix	Kieran Cawthray	2021-07-25	2	-21/+9
\| * \| \| \| \| \| \|	Add extra screen in settings to show scrollbar correctly	Kieran Cawthray	2021-07-24	1	-3/+3
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-23	5	-17/+52
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-20	27	-158/+156
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	34	-602/+714
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix bad merge	Kieran Cawthray	2021-06-29	1	-27/+0
\| * \| \| \| \| \| \| \| \| \|	Replace font file	Kieran Cawthray	2021-06-29	1	-0/+0
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-06-29	8	-19/+95
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add reset button, reduce button opacity	Kieran Cawthray	2021-06-27	2	-12/+37
\| * \| \| \| \| \| \| \| \| \| \|	Fix the fix, whoops	Kieran Cawthray	2021-06-25	1	-7/+7
\| * \| \| \| \| \| \| \| \| \| \|	Add a check to set default colors if all colors are white	Kieran Cawthray	2021-06-25	1	-0/+7
\| * \| \| \| \| \| \| \| \| \| \|	Make it loop around when you get to the end of the list of colors	Kieran Cawthray	2021-06-25	1	-0/+28
\| * \| \| \| \| \| \| \| \| \| \|	Fix off-by-one error, reduce step gauge needle width	Kieran Cawthray	2021-06-25	2	-5/+5
\| * \| \| \| \| \| \| \| \| \| \|	Use colors from settings for PineTimeStyle watchface	Kieran Cawthray	2021-06-25	2	-5/+10
\| * \| \| \| \| \| \| \| \| \| \|	Move array to member variable, retrieve colors from settings for display	Kieran Cawthray	2021-06-25	2	-13/+10
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-06-25	7	-199/+213
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	PineTimeStyle color picker tidying	Kieran Cawthray	2021-06-24	2	-56/+5
\| * \| \| \| \| \| \| \| \| \| \| \|	PineTimeStyle color picker add settings integration	Kieran Cawthray	2021-06-24	2	-45/+84
\| * \| \| \| \| \| \| \| \| \| \| \|	PineTimeStyle color picker initial commit	Kieran Cawthray	2021-06-24	7	-2/+385
\| * \| \| \| \| \| \| \| \| \| \| \|	Move static needle_colors array to member variable	Kieran Cawthray	2021-06-23	2	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Add font source file	Kieran Cawthray	2021-06-22	1	-0/+0
\| * \| \| \| \| \| \| \| \| \| \| \|	Set step gauge outer to be white when step goal is reached	Kieran Cawthray	2021-06-21	1	-2/+6
\| * \| \| \| \| \| \| \| \| \| \| \|	Enable 12/24h functionality	Kieran Cawthray	2021-06-20	2	-1/+30
\| * \| \| \| \| \| \| \| \| \| \| \|	Add step count gauge - replaces heartrate in sidebar	Kieran Cawthray	2021-06-20	4	-29/+38
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-06-20	10	-29/+603
\| \|\ \ \ \ \ \ \ \ \ \ \ \