InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	5	-150/+113
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	1	-3/+0
\| * \| \| \| \| \| \|	Update Settings.cpp	Itai Nelken	2021-09-02	1	-2/+2
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Revert "Merge upstream"	Mark Russell	2021-09-16	4	-3/+13
* \| \| \| \| \| \|	Merge upstream	Mark Russell	2021-09-16	4	-13/+3
* \| \| \| \| \| \|	Fixes per Riksu9000's feedback	Mark Russell	2021-09-16	2	-15/+19
* \| \| \| \| \| \|	License header fix, add missing braces	Mark Russell	2021-09-13	2	-2/+10
* \| \| \| \| \| \|	Fixes based on code reviews (formatting, UI code)	Mark Russell	2021-09-13	2	-52/+92
* \| \| \| \| \| \|	Created basic alarm app	Mark Russell	2021-09-10	3	-1/+257
\|/ / / / / /
* \| \| \| / /	Fix notifications that wouldn't auto close when the timeout elapsed (in previ...	Jean-François Milants	2021-08-31	1	-1/+0
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Settings : use enums instead of ints to store colors. Group all PTS settings ...	Jean-François Milants	2021-08-28	4	-96/+79
* \| \| \| \|	Merge pull request #458 from kieranc/pinetimestyle-colorpicker	JF002	2021-08-28	6	-16/+425
\|\ \ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-19	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-15	14	-266/+227
\| \|\ \ \ \ \
\| * \| \| \| \| \|	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	9	-143/+54
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-28	20	-99/+98
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Increment settings value, remove old hacky fix	Kieran Cawthray	2021-07-25	1	-20/+8
\| * \| \| \| \| \| \|	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	2	-8/+34
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-20	13	-103/+61
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	17	-383/+246
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix bad merge	Kieran Cawthray	2021-06-29	1	-27/+0
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-06-29	2	-4/+34
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	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