InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	Add WATCH_COLMI_P8 option to cmake & docs	hubmartin	2021-09-13	2	-0/+10
*	Merge branch 'develop' into pinmap	hubmartin	2021-09-13	17	-86/+71
\|\
\| *	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	37	-350/+422
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	13	-217/+226
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	8	-32/+38
\| * \| \| \| \| \|	Merge pull request #552 from Riksu9000/new_to_infinitime	JF002	2021-09-12	1	-17/+7
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Move getting started slightly lower	Riku Isokoski	2021-08-03	1	-5/+5
\| \| * \| \| \| \| \|	Make it easier for new people to find instructions	Riku Isokoski	2021-08-03	1	-16/+6
\| * \| \| \| \| \| \|	Merge pull request #551 from hubmartin/patch-3	JF002	2021-09-12	1	-0/+4
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Add FW validation note after DFU flash	Martin Hub	2021-08-03	1	-0/+4
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge pull request #550 from hubmartin/patch-2	JF002	2021-09-12	1	-0/+4
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Update ota-gadgetbridge-nrfconnect.md	Martin Hub	2021-08-03	1	-0/+4
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge pull request #615 from Utopiah/patch-1	JF002	2021-09-11	1	-0/+1
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Infini-iOS	Fabien Benetou	2021-08-26	1	-0/+1
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-down	JF002	2021-09-11	1	-2/+2
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Update Settings.cpp	Itai Nelken	2021-09-02	1	-2/+2
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Set version to 1.4.0.	Jean-François Milants	2021-09-02	1	-1/+1
\| * \| \| \| \| \| \|	Merge pull request #579 from mabuch/fix-github-build	JF002	2021-09-01	1	-15/+9
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Github Action - update mcuboot version	mabuch	2021-08-14	1	-6/+1
\| \| * \| \| \| \| \| \|	fix Github Action build Firmware	mabuch	2021-08-14	1	-15/+14
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Fix notifications that wouldn't auto close when the timeout elapsed (in previ...	Jean-François Milants	2021-08-31	1	-1/+0
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-29	94	-539/+968
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	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	24	-333/+356
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	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	28	-269/+553
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-28	40	-239/+347
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	Restore .gitignore	Kieran Cawthray	2021-07-23	1	-0/+41
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-23	6	-18/+53
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Remove .gitignore	Kieran Cawthray	2021-07-22	1	-41/+0
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-20	27	-158/+156
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'pinetimestyle-colorpicker' of github.com:kieranc/InfiniTime int...	Kieran Cawthray	2021-07-12	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-11	35	-566/+696
\| \| \| \|\ \ \ \ \ \ \ \ \