InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime i...	Jean-François Milants	2021-10-10	1	-0/+1
\|\
\| *	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-18	1	-0/+5
\| \|\
\| * \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-14	1	-4/+11
\| \|\ \
\| * \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-28	1	-6/+10
\| \|\ \ \
\| * \| \| \|	Automatic error detection	Riku Isokoski	2021-08-18	1	-0/+1
* \| \| \| \|	Merge with develop and fix conflicts from timaios:set-datetime-manually.	Jean-François Milants	2021-10-10	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge branch 'JF002:develop' into set-datetime-manually	Tim	2021-08-08	1	-4/+25
\| \|\\| \| \|
\| * \| \| \|	Include new screens in CMakeLists.txt	timaios	2021-07-09	1	-0/+2
* \| \| \| \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	1	-4/+8
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into...	Jean-François Milants	2021-09-13	1	-4/+7
\| \|\ \ \ \
\| \| * \| \| \|	WIP Refactor ble advertising	James A. Jerkins	2021-08-29	1	-4/+7
\| * \| \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-29	1	-0/+7
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' into pinmap	hubmartin	2021-08-22	1	-6/+6
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	DRAFT: Put gpio pins to separate file	hubmartin	2021-08-02	1	-0/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Revert "Merge upstream"	Mark Russell	2021-09-16	1	-8/+4
* \| \| \| \| \|	Merge upstream	Mark Russell	2021-09-16	1	-4/+8
* \| \| \| \| \|	Created basic alarm app	Mark Russell	2021-09-10	1	-0/+5
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Settings : use enums instead of ints to store colors. Group all PTS settings ...	Jean-François Milants	2021-08-28	1	-0/+2
* \| \| \| \|	Merge pull request #458 from kieranc/pinetimestyle-colorpicker	JF002	2021-08-28	1	-0/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-19	1	-6/+6
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	1	-4/+25
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	PineTimeStyle color picker initial commit	Kieran Cawthray	2021-06-24	1	-0/+1
\| * \| \| \|	Add step count gauge - replaces heartrate in sidebar	Kieran Cawthray	2021-06-20	1	-0/+2
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-06-16	1	-4/+4
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-06-04	1	-39/+41
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-05-21	1	-0/+5
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix it again..	Kieran Cawthray	2021-05-18	1	-0/+2
\| * \| \| \| \| \| \|	Revert "Reset"	Kieran Cawthray	2021-05-18	1	-2/+3
\| * \| \| \| \| \| \|	Reset	Kieran Cawthray	2021-05-18	1	-3/+2
* \| \| \| \| \| \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-08-18	1	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add memory print usage	hubmartin	2021-08-18	1	-6/+6
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* / \| \| \| \| \|	New touch handler, with issues	Riku Isokoski	2021-07-15	1	-0/+4
\|/ / / / / /
* \| \| \| \| /	Using littlefs (#438)	joaquim.org	2021-07-11	1	-4/+25
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Add PineTimeStyle watchface (#334)	kieranc	2021-06-29	1	-0/+4
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Remove infinitime-nb.c from source list	Jonathan Vander Mey	2021-06-12	1	-2/+0
* \| \| \|	add basic metronome app (#409)	Bryton Hall	2021-06-12	1	-0/+2
* \| \| \|	Initialize SystemTask, DisplayApp and HeartRateTask as global static variable...	Jean-François Milants	2021-06-06	1	-2/+2
\| \|_\|/ \|/\| \|
* \| \|	Enable various compilation flags to reduce the binary size (#401)	JF002	2021-06-01	1	-37/+37
* \| \|	Remove debug defines (DEBUG & DEBUG_NRF_USER) from the build. These debug can...	JF002	2021-06-01	1	-2/+4
\| \|/ \|/\|
* \|	Timer App (#355)	Florian	2021-05-20	1	-0/+5
\|/
*	New Steps app	Joaquim	2021-04-19	1	-0/+3
*	Merge branch 'develop' into motion-sensor	Jean-François Milants	2021-04-09	1	-92/+18
\|\
\| *	Big UI and navigation Rewrite	Joaquim	2021-04-04	1	-92/+17
* \|	TwiMaster is now based on the NRFX TWI driver, as it handles more edge cases ...	Jean-François Milants	2021-04-08	1	-1/+1
* \|	First integration of the motion sensor (bma 421) : step counting + wake on wr...	Jean-François Milants	2021-04-04	1	-0/+14
\|/
*	Updated to include WatchFaceAnalog and fixed clashes	Niall Cooling	2021-03-22	1	-18/+213
\|\
\| *	Merged upstream	panky-codes	2021-03-20	1	-19/+218
\| \|\
\| \| *	Merge branch 'develop' of github.com:JF002/Pinetime into develop	Jean-François Milants	2021-03-20	1	-1/+13
\| \| \|\
\| \| \| *	Merge from upstream	Joaquim	2021-03-06	1	-9/+20
\| \| \| *	Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock	Joaquim	2021-02-25	1	-7/+7
\| \| \| \|\