aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #240 from joaquimorg/ScreenCorruptionFIXJF0022021-03-204-77/+37
|\ | | | | FIX screen corruption (Issue #213)
| * FIX screen corruption #213Joaquim2021-03-184-77/+37
| |
* | Merge pull request #237 from muesli/systeminfo-urlJF0022021-03-201-1/+1
|\ \ | | | | | | Update project URL in SystemInfo
| * | Update project URL in SystemInfoChristian Muehlhaeuser2021-03-161-1/+1
| |/ | | | | | | Pinetime -> InfiniTime
* | Merge pull request #235 from MFAshby/doc_correctionJF0022021-03-206-11/+11
|\ \ | | | | | | Small correction to git URL in documentation files
| * | 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
|\ \ | | | | | | | | | | | | | | | # Conflicts: # src/main.cpp # src/systemtask/SystemTask.h
| * \ Merge pull request #217 from joaquimorg/MultiFaceClockJF0022021-03-2025-313/+1318
| |\ \ | | |/ | |/| Multi face support, analog clock, 12/24 config
| | * 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
| | | | | | | | | | | | | | | | | | | | This reverts commit 15484d0b34099b50c300b6f76e23f70f171bb409.
| * | | | Add submodule again...Jean-François Milants2021-03-073-1/+27
| | | | |
| * | | | Merge branch 'develop' into recovery-firmwareJean-François Milants2021-03-07559-100313/+33634
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
* | | | | Merge pull request #223 from hubmartin/patch-1JF0022021-03-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add link to README.md to WebBLEWatch to update time from web browser
| * | | | | Add WebBLEWatch option to update timeMartin Hub2021-03-041-0/+1
| | | | | |
* | | | | | Merge pull request #222 from nscooling/refactor-clock-private-staticsJF0022021-03-062-39/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moved private statics into unnamed namespace in cpp file
| * | | | | | Moved private statics into unnamed namespace in cpp file to reduce coupling ↵Niall Cooling2021-03-032-39/+39
| |/ / / / / | | | | | | | | | | | | | | | | | | and uncessar in header
* | | | | | Merge pull request #221 from nscooling/C++14JF0022021-03-061-9/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Refactored src/CMakelist to support C++14
| * | | | | Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ↵Niall Cooling2021-03-031-9/+20
| | |_|/ / | |/| | | | | | | | | | | | | -std= directives
* | | | | Update pictures in the main README.md file.Jean-François Milants2021-02-254-1/+2
| |_|_|/ |/| | |
* | | | Set version to 0.14.0Jean-François Milants2021-02-241-1/+1
|/ / /
* | | Merge pull request #211 from roblabla/fix-flashingJF0022021-02-241-7/+7
|\ \ \ | |_|/ |/| | Flash correct file name
| * | Flash correct file nameroblabla2021-02-191-7/+7
| | |
* | | Update doc : init git submodule before build.Jean-François Milants2021-02-231-0/+1
| | |
* | | Fix LVGL submodule (sorry!)Jean-François Milants2021-02-23294-241414/+0
| | |
* | | Merge branch 'joaquimorg-LVGL7' into developJean-François Milants2021-02-23373-51933/+203919
|\ \ \ | |/ / |/| |
| * | Remove LVGL folder (it's now a submodule)Jean-François Milants2021-02-23340-50598/+202756
| | |
| * | Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵Jean-François Milants2021-02-2333-1335/+1163
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joaquimorg-LVGL7 # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.cpp # src/displayapp/screens/Modal.cpp # src/displayapp/screens/Modal.h # src/displayapp/screens/Notifications.cpp # src/displayapp/screens/Tile.h
| * | Fix delay in button actionsJoaquim2021-02-222-30/+1
| | |
| * | CleanupJoaquim2021-02-0112-241/+13
| | |
| * | Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7Joaquim2021-02-0110-6/+244
| |\ \
| * | | LVGL v7.10.0Joaquim2021-01-2827-1117/+1229
| | | |
| * | | LVGL V7 UpgradeJoaquim2021-01-28207-89256/+3
| | | |
* | | | Set version to 0.13.0Jean-François Milants2021-02-141-1/+1
| | | |
* | | | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-02-1430-501/+932
|\ \ \ \
| * \ \ \ Merge pull request #205 from nscooling/dirtyRefactorJF0022021-02-141-13/+13
| |\ \ \ \ | | | | | | | | | | | | refactored class DirtyValue
| | * | | | refactored class DirtyValueNiall Cooling2021-02-121-13/+13
| | | | | |
| * | | | | Merge pull request #186 from petterhs/musicUIJF0022021-02-141-7/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | music: Symbols for the buttons
| | * | | | | improve music UI with icons for play/pause/next/prev/ and volumepetter2021-01-271-7/+8
| | | | | | |
| | * | | | | update font with icons for music, call and qrpetter2021-01-273-396/+498
| | | |/ / / | | |/| | |
| * | | | | Remove debug variable.Jean-François Milants2021-02-141-1/+1
| | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2026-01-19 07:36:21 +0000