summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-03-20Merge pull request #240 from joaquimorg/ScreenCorruptionFIXJF0024-78/+38
2021-03-20Merge pull request #237 from muesli/systeminfo-urlJF0021-1/+1
2021-03-20Merge pull request #235 from MFAshby/doc_correctionJF0026-11/+11
2021-03-20Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants27-319/+1327
2021-03-20Merge pull request #217 from joaquimorg/MultiFaceClockJF00225-315/+1320
2021-03-18FIX screen corruption #213Joaquim4-78/+38
2021-03-16Update project URL in SystemInfoChristian Muehlhaeuser1-1/+1
2021-03-15Small correction to git URL in documentation filesMartin Ashby6-11/+11
2021-03-08fix AM/PMJoaquim José Almeida Pereira1-5/+15
2021-03-07Set version to 0.14.1Jean-François Milants1-1/+1
2021-03-07Merge branch 'recovery-firmware' of JF/PineTime into developJF49-108/+3624
2021-03-07Add submodule again...Jean-François Milants2-0/+3
2021-03-07Revert "Add submodule again..."Jean-François Milants3-27/+1
2021-03-07Add submodule again...Jean-François Milants3-1/+27
2021-03-07Merge branch 'develop' into recovery-firmwareJean-François Milants559-100328/+33649
2021-03-06Merge branch 'develop' into MultiFaceClockjoaquim.org0-0/+0
2021-03-06clean up vsc settingsJoaquim1-1/+0
2021-03-06Update from JF comments to PRJoaquim5-33/+6
2021-03-06Merge from upstreamJoaquim6-11/+25
2021-03-06Merge pull request #223 from hubmartin/patch-1JF0021-0/+1
2021-03-06Merge pull request #222 from nscooling/refactor-clock-private-staticsJF0022-39/+39
2021-03-06Merge pull request #221 from nscooling/C++14JF0021-9/+20
2021-03-04Add WebBLEWatch option to update timeMartin Hub1-0/+1
2021-03-03Moved private statics into unnamed namespace in cpp file to reduce coupling a...Niall Cooling2-39/+39
2021-03-03Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ...Niall Cooling1-9/+20
2021-02-25Update pictures in the main README.md file.Jean-François Milants4-1/+2
2021-02-25Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim1-1/+1
2021-02-25Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim1-7/+7
2021-02-24Multi face support, analog clock, 12/24 configJoaquim25-313/+1335
2021-02-24Set version to 0.14.0Jean-François Milants1-1/+1
2021-02-24Merge pull request #211 from roblabla/fix-flashingJF0021-7/+7
2021-02-23Update doc : init git submodule before build.Jean-François Milants1-0/+1
2021-02-23Fix LVGL submodule (sorry!)Jean-François Milants294-241414/+0
2021-02-23Merge branch 'joaquimorg-LVGL7' into developJean-François Milants373-52274/+204260
2021-02-23Remove LVGL folder (it's now a submodule)Jean-François Milants340-50932/+203090
2021-02-23Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimor...Jean-François Milants33-1342/+1170
2021-02-22Fix delay in button actionsJoaquim2-30/+1
2021-02-19Flash correct file nameroblabla1-7/+7
2021-02-14Set version to 0.13.0Jean-François Milants1-1/+1
2021-02-14Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants30-503/+934
2021-02-14Fix IRQ management in FreeRTOS to avoid crash and deadlock in BLE stack.Jean-François Milants2-2/+24
2021-02-14Merge pull request #205 from nscooling/dirtyRefactorJF0021-13/+13
2021-02-14Merge pull request #186 from petterhs/musicUIJF0021-7/+8
2021-02-14Remove debug variable.Jean-François Milants1-1/+1
2021-02-14Merge pull request #206 from nscooling/Hrs3300_SetGain_remove_warningsJF0021-4/+5
2021-02-14Merge branch 'develop' into Hrs3300_SetGain_remove_warningsJF00227-478/+907
2021-02-14Merge pull request #182 from petterhs/warningsJF0024-8/+6
2021-02-14Merge branch 'jlukanc1-upstream-dev' into developJean-François Milants10-7/+80
2021-02-14Fix merge conflict.Jean-François Milants10-7/+80
2021-02-14Merge pull request #161 from petterhs/callsJF00219-469/+827