InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix display of empty notification.	Jean-François Milants	2021-04-09	1	-1/+1
\|
*	Merge branch 'notification-title' into develop	Jean-François Milants	2021-04-09	7	-18/+47
\|\
\| *	Merge branch 'develop' into notification-title	Jean-François Milants	2021-04-09	489	-10581/+58742
\| \|\ \| \|/ \|/\| \| \| \| \|	# Conflicts: # src/displayapp/screens/Notifications.cpp
* \|	Merge pull request #259 from JF002/fix-music-app2	JF002	2021-04-09	4	-13/+17
\|\ \ \| \| \| \| \| \|	Fix music app
\| * \|	Fix music app :	Jean-François Milants	2021-04-04	4	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Enable LVGL animation (and disable groups, which were not used), and set the speed. - Fix disc animation and progress display by initializing lastIncrement at 0 (a random value will be used otherwise, in release build)
* \| \|	Merge pull request #258 from joaquimorg/BigRewrite	JF002	2021-04-09	487	-10573/+58730
\|\ \ \ \| \|/ / \|/\| \|	New settings menu and more...
\| * \|	add more memory to displayapp task	Joaquim	2021-04-09	1	-1/+1
\| \| \|
\| * \|	restore battery buffer	Joaquim	2021-04-08	3	-12/+41
\| \| \|
\| * \|	Fix wake up lock in twi	Joaquim	2021-04-05	5	-44/+50
\| \| \| \| \| \| \| \| \| \| \| \|	optimize battery code
\| * \|	array in SettingWakeUp wrong size	Joaquim José Almeida Pereira	2021-04-05	3	-3/+3
\| \| \|
\| * \|	font creation	Joaquim	2021-04-04	1	-4/+13
\| \| \|
\| * \|	double tap wakeup error fix	Joaquim	2021-04-04	7	-68/+89
\| \| \| \| \| \| \| \| \| \| \| \|	battery nonblocking read
\| * \|	Big UI and navigation Rewrite	Joaquim	2021-04-04	484	-10517/+58609
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new navigation add some color to the apps redesign menus new settings menu new quick settings code clean up size reduction by converting navigation images to font and more...
* \| \|	Merge pull request #239 from muesli/badge-link	JF002	2021-04-04	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Fix README build-badge link
\| * \|	Fix README build-badge link	Christian Muehlhaeuser	2021-03-21	1	-1/+1
\| \| \|
\| \| *	Ignore notification with empty message.	Jean-François Milants	2021-04-04	2	-4/+10
\| \| \|
\| \| *	Notification app : disable swipe when the app is in 'preview' mode. In this ↵	Jean-François Milants	2021-04-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mode, only the new notification should be displayed, there is no point to allow navigating to past notifications. Works as a workaround for the crash that occurs when you swipe the notification app in preview mode (https://github.com/JF002/InfiniTime/issues/250).
\| \| *	Add support for notification title. The notification buffer must contain the ↵	Jean-François Milants	2021-04-04	7	-9/+30
\| \|/ \|/\| \| \| \| \| \| \| \| \|	title and the message separated by a '\0' character. If the buffer does not contain any \0, the whole buffer is considered to be the message of the notification. A default title will be displayed in the notification app.
* \|	Merge pull request #238 from nscooling/make_unique	JF002	2021-03-31	11	-69/+64
\|\ \ \| \| \| \| \| \|	Resolved C++14 Cmake build issues so correctly building to C99/C++14
\| * \|	replaced all unique_ptr.reset calls with std::make_unique	Niall Cooling	2021-03-22	7	-39/+45
\| \| \|
\| * \|	Updated to include WatchFaceAnalog and fixed clashes	Niall Cooling	2021-03-22	83	-557/+5369
\| \|\ \
\| * \| \|	Resolved C++14 Cmake build issues so correctly building to C99/C++14 standards	Niall Cooling	2021-03-16	4	-23/+16
\| \| \| \|
* \| \| \|	Merge pull request #249 from alexr4535/develop	JF002	2021-03-24	1	-1/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	add siglo as a companion app
\| * \| \|	add siglo as a companion app	Alex Robinson	2021-03-23	1	-1/+2
\|/ / /
* \| \|	Set version to 0.15.0	Jean-François Milants	2021-03-21	1	-1/+1
\| \| \|
* \| \|	Update buildAndProgram.md with info about Debug/Release builds.	Jean-François Milants	2021-03-21	1	-5/+10
\| \| \|
* \| \|	Merge pull request #245 from petterhs/fixDisplayErrors	JF002	2021-03-21	2	-8/+4
\|\ \ \ \| \| \| \| \| \| \| \|	fix display driver issues in recovery
\| * \| \|	fix display driver issues in recovery	petter	2021-03-21	2	-8/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #244 from joaquimorg/LVGL7.11.0	JF002	2021-03-21	1	-0/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Update to LVGL 7.11.0 Final
\| * \| \|	Update to LVGL 7.11.0 Final	Joaquim	2021-03-20	1	-0/+0
\| \|/ /
* \| \|	Merge pull request #231 from Panky-codes/feature/add-stop-watch	JF002	2021-03-21	10	-45/+376
\|\ \ \ \| \|/ / \|/\| \|	Added stopwatch
\| * \|	Added stopwatch app to readme	panky-codes	2021-03-21	1	-0/+1
\| \| \|
\| * \|	Reverted the paddle app in displayapp.cpp	panky-codes	2021-03-21	1	-2/+2
\| \| \|
\| * \|	Updated lvgl submodule to match with develop branch	panky-codes	2021-03-21	1	-0/+0
\| \| \|
\| * \|	Merged upstream	panky-codes	2021-03-20	76	-525/+4990
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #240 from joaquimorg/ScreenCorruptionFIX	JF002	2021-03-20	4	-77/+37
\|\ \ \ \| \| \| \| \| \| \| \|	FIX screen corruption (Issue #213)
\| * \| \|	FIX screen corruption #213	Joaquim	2021-03-18	4	-77/+37
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #237 from muesli/systeminfo-url	JF002	2021-03-20	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Update project URL in SystemInfo
\| * \| \|	Update project URL in SystemInfo	Christian Muehlhaeuser	2021-03-16	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Pinetime -> InfiniTime
* \| \|	Merge pull request #235 from MFAshby/doc_correction	JF002	2021-03-20	6	-11/+11
\|\ \ \ \| \| \| \| \| \| \| \|	Small correction to git URL in documentation files
\| * \| \|	Small correction to git URL in documentation files	Martin Ashby	2021-03-15	6	-11/+11
\| \|/ /
* \| \|	Merge branch 'develop' of github.com:JF002/Pinetime into develop	Jean-François Milants	2021-03-20	27	-317/+1325
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/main.cpp # src/systemtask/SystemTask.h
\| * \ \	Merge pull request #217 from joaquimorg/MultiFaceClock	JF002	2021-03-20	25	-313/+1318
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Multi face support, analog clock, 12/24 config
\| \| * \|	fix AM/PM	Joaquim José Almeida Pereira	2021-03-08	1	-5/+15
\| \| \| \|
\| \| * \|	Merge branch 'develop' into MultiFaceClock	joaquim.org	2021-03-06	0	-0/+0
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	clean up vsc settings	Joaquim	2021-03-06	1	-1/+0
\| \| \| \|
\| \| * \|	Update from JF comments to PR	Joaquim	2021-03-06	5	-33/+6
\| \| \| \|
\| \| * \|	Merge from upstream	Joaquim	2021-03-06	6	-11/+25
\| \| \| \|
\| \| * \|	Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock	Joaquim	2021-02-25	1	-1/+1
\| \| \|\ \
\| \| * \ \	Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock	Joaquim	2021-02-25	1	-7/+7
\| \| \|\ \ \