aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #239 from muesli/badge-linkJF0022021-04-041-1/+1
|\
| * Fix README build-badge linkChristian Muehlhaeuser2021-03-211-1/+1
* | Merge pull request #238 from nscooling/make_uniqueJF0022021-03-3111-69/+64
|\ \
| * | replaced all unique_ptr.reset calls with std::make_uniqueNiall Cooling2021-03-227-39/+45
| * | Updated to include WatchFaceAnalog and fixed clashesNiall Cooling2021-03-2283-557/+5369
| |\ \
| * | | Resolved C++14 Cmake build issues so correctly building to C99/C++14 standardsNiall Cooling2021-03-164-23/+16
* | | | Merge pull request #249 from alexr4535/developJF0022021-03-241-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | add siglo as a companion appAlex Robinson2021-03-231-1/+2
|/ / /
* | | Set version to 0.15.0Jean-François Milants2021-03-211-1/+1
* | | Update buildAndProgram.md with info about Debug/Release builds.Jean-François Milants2021-03-211-5/+10
* | | Merge pull request #245 from petterhs/fixDisplayErrorsJF0022021-03-212-8/+4
|\ \ \
| * | | fix display driver issues in recoverypetter2021-03-212-8/+4
| | |/ | |/|
* | | Merge pull request #244 from joaquimorg/LVGL7.11.0JF0022021-03-211-0/+0
|\ \ \
| * | | Update to LVGL 7.11.0 FinalJoaquim2021-03-201-0/+0
| |/ /
* | | Merge pull request #231 from Panky-codes/feature/add-stop-watchJF0022021-03-2110-45/+376
|\ \ \ | |/ / |/| |
| * | Added stopwatch app to readmepanky-codes2021-03-211-0/+1
| * | Reverted the paddle app in displayapp.cpppanky-codes2021-03-211-2/+2
| * | Updated lvgl submodule to match with develop branchpanky-codes2021-03-211-0/+0
| * | Merged upstreampanky-codes2021-03-2076-525/+4990
| |\ \ | |/ / |/| |
* | | Merge pull request #240 from joaquimorg/ScreenCorruptionFIXJF0022021-03-204-77/+37
|\ \ \
| * | | FIX screen corruption #213Joaquim2021-03-184-77/+37
| | |/ | |/|
* | | Merge pull request #237 from muesli/systeminfo-urlJF0022021-03-201-1/+1
|\ \ \
| * | | Update project URL in SystemInfoChristian Muehlhaeuser2021-03-161-1/+1
| |/ /
* | | Merge pull request #235 from MFAshby/doc_correctionJF0022021-03-206-11/+11
|\ \ \
| * | | Small correction to git URL in documentation filesMartin Ashby2021-03-156-11/+11
| |/ /
* | | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-03-2027-317/+1325
|\ \ \
| * \ \ Merge pull request #217 from joaquimorg/MultiFaceClockJF0022021-03-2025-313/+1318
| |\ \ \ | | |/ / | |/| |
| | * | fix AM/PMJoaquim José Almeida Pereira2021-03-081-5/+15
| | * | Merge branch 'develop' into MultiFaceClockjoaquim.org2021-03-060-0/+0
| | |\ \ | | |/ / | |/| |
| | * | clean up vsc settingsJoaquim2021-03-061-1/+0
| | * | Update from JF comments to PRJoaquim2021-03-065-33/+6
| | * | Merge from upstreamJoaquim2021-03-066-11/+25
| | * | Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim2021-02-251-1/+1
| | |\ \
| | * \ \ Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim2021-02-251-7/+7
| | |\ \ \
| | * | | | Multi face support, analog clock, 12/24 configJoaquim2021-02-2425-311/+1333
* | | | | | Set version to 0.14.1Jean-François Milants2021-03-071-1/+1
* | | | | | Merge branch 'recovery-firmware' of JF/PineTime into developJF2021-03-0749-107/+3623
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add submodule again...Jean-François Milants2021-03-072-0/+3
| * | | | | Revert "Add submodule again..."Jean-François Milants2021-03-073-27/+1
| * | | | | Add submodule again...Jean-François Milants2021-03-073-1/+27
| * | | | | Merge branch 'develop' into recovery-firmwareJean-François Milants2021-03-07559-100313/+33634
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add new cmake option to disable the generation of DFU file (which needs adafr...Jean-François Milants2021-02-014-10/+50
| * | | | | Remove BLE debug codeJean-François Milants2021-01-311-2/+2
| * | | | | Generate pinetime-recovery : a light version of InfiniTime design to be used ...Jean-François Milants2021-01-2645-80/+3579
| | | | | * Reworked based on PR comments.panky-codes2021-03-204-38/+56
| | | | | * Removed unused variables. Tested.panky-codes2021-03-153-9/+8
| | | | | * Increased the size of the button and realigned the layout a bit. Tested.panky-codes2021-03-131-5/+7
| | | | | * Added some comments for clarity. Ready for review. Tested.panky-codes2021-03-132-3/+15
| | | | | * Stopwatch completed. Ready for PRpanky-codes2021-03-135-55/+75
| | | | | * Adding laps completed.panky-codes2021-03-132-6/+17