InfiniTime - My branch of InfiniTime

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix merge conflict.	Jean-François Milants	2021-02-14	10	-7/+80
\|\
\| *	add vibration toggle	petter	2021-02-07	4	-1/+16
\| *	refactor MotorController	petter	2021-02-05	2	-24/+10
\| *	trigger vibration from systemtask	petter	2021-02-05	5	-21/+9
\| *	remove vibtimer from .h to fix nonstop vibration	jlukanc	2021-01-25	1	-1/+0
\| *	create motorcontroller in main and pass by reference	petter	2021-01-25	7	-10/+31
\| *	move app timer def	jlukanc	2021-01-25	2	-5/+5
\| *	Merge branch 'develop' into upstream-dev	The King	2021-01-24	321	-478/+12197
\| \|\
\| * \|	fix merge issue	jlukanc	2021-01-23	1	-0/+5
\| * \|	fis merge conflict?	jlukanc	2021-01-23	1	-1/+1
\| * \|	remove unneeded defines	jlukanc	2021-01-23	2	-39/+1
\| * \|	add motor to notifs, fix tabs in motorcontroller.h	jlukanc	2021-01-15	3	-34/+40
\| * \|	add motorcontroller to cmake	jlukanc	2021-01-15	1	-0/+2
\| * \|	add non-blocking motor controller	jlukanc	2021-01-15	3	-0/+99
* \| \|	Merge pull request #161 from petterhs/calls	JF002	2021-02-14	19	-467/+825
\|\ \ \
\| * \| \|	add mute button and functionality for call notification + new button icons	petter	2021-01-27	4	-6/+47
\| * \| \|	update font with icons for music, call and qr	petter	2021-01-27	3	-396/+498
\| * \| \|	Revert invalid changes in Navigation.h and add missing changes in Notificatio...	Jean-François Milants	2021-01-24	2	-3/+8
\| * \| \|	Handle call notification the same way than other notifications.	Jean-François Milants	2021-01-24	13	-88/+196
\| * \| \|	change Notification Event base UUID	petter	2021-01-21	2	-14/+14
\| * \| \|	change Notification Event UUID	petter	2021-01-21	2	-6/+8
\| * \| \|	Add incoming call functionality	Rasmus Schenstrom	2021-01-21	10	-18/+118
* \| \| \|	Set version to 0.12.1	Jean-François Milants	2021-02-07	1	-1/+1
* \| \| \|	Fix memory leak in timer management in port layer of Nimble.	Jean-François Milants	2021-02-07	1	-0/+2
* \| \| \|	Merge branch 'update-nimble-1_3-master' into develop	Jean-François Milants	2021-02-04	2	-3/+3
\|\ \ \ \
\| * \| \| \|	Increase FreeRTOS heap size and re-enable heart rate task. New Nimble probabl...	Jean-François Milants	2021-02-03	2	-3/+3
* \| \| \| \|	Merge pull request #198 from JF002/update-nimble-1_3-master	JF002	2021-02-04	286	-9255/+31323
\|\\| \| \| \|
\| * \| \| \|	Update to nimble 1.3 master branch commit 82153e744833821e20e9a8b0d61c38b2b0d...	Jean-François Milants	2021-02-02	286	-9255/+31323
* \| \| \| \|	Set version to 0.12..0	Jean-François Milants	2021-02-04	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #197 from Avamander/patch-9	JF002	2021-01-31	1	-0/+3
\|\ \ \ \
\| * \| \| \|	Enabled clang-format in Clion	Avamander	2021-01-31	1	-0/+3
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #196 from Avamander/patch-8	JF002	2021-01-31	1	-0/+26
\|\ \ \ \
\| * \| \| \|	Re-enabled use-after-move warning	Avamander	2021-01-31	1	-1/+0
\| * \| \| \|	Added clang-tidy configuration	Avamander	2021-01-30	1	-0/+27
\| \|/ / /
* \| \| \|	Merge pull request #194 from Avamander/patch-6	JF002	2021-01-31	1	-0/+136
\|\ \ \ \
\| * \| \| \|	Added Clang Format rules	Avamander	2021-01-30	1	-0/+136
\| \|/ / /
* \| \| \|	Merge pull request #195 from Avamander/patch-7	JF002	2021-01-31	1	-1/+21
\|\ \ \ \
\| * \| \| \|	Improve CLion's formatting rules	Avamander	2021-01-30	1	-1/+21
\| \|/ / /
* \| \| \|	Merge pull request #193 from Avamander/patch-5	JF002	2021-01-31	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Update CMakeLists.txt	Avamander	2021-01-30	1	-1/+1
\| \|/ / /
* \| \| \|	Normalize all the line endings	Jean-François Milants	2021-01-31	3	-4/+4
* \| \| \|	Merge pull request #192 from Avamander/patch-4	JF002	2021-01-31	1	-0/+15
\|\ \ \ \
\| * \| \| \|	Create .gitattributes	Avamander	2021-01-30	1	-0/+15
\| \|/ / /
* \| \| \|	Merge pull request #191 from Avamander/patch-3	JF002	2021-01-31	1	-0/+5
\|\ \ \ \
\| * \| \| \|	Create .gitconfig	Avamander	2021-01-30	1	-0/+5
\| \|/ / /
* \| \| \|	Merge pull request #190 from Avamander/patch-1	JF002	2021-01-31	1	-0/+33
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Create CONTRIBUTING.md	Avamander	2021-01-30	1	-0/+33
\|/ / /
* \| \|	Merge pull request #178 from petterhs/docker	JF002	2021-01-23	1	-3/+5
\|\ \ \
\| * \| \|	check for cmake build-success before running post-build.sh	petter	2021-01-23	1	-3/+5
\| \|/ /
* \| \|	Merge pull request #175 from nscooling/fix_octal_error_in_St7789_list	JF002	2021-01-23	1	-1/+1
\|\ \ \