summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-03-20Merge pull request #235 from MFAshby/doc_correctionJF0026-11/+11
Small correction to git URL in documentation files
2021-03-20Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants27-319/+1327
# Conflicts: # src/main.cpp # src/systemtask/SystemTask.h
2021-03-20Merge pull request #217 from joaquimorg/MultiFaceClockJF00225-315/+1320
Multi face support, analog clock, 12/24 config
2021-03-18FIX screen corruption #213Joaquim4-78/+38
2021-03-16Resolved C++14 Cmake build issues so correctly building to C99/C++14 standardsNiall Cooling4-23/+16
2021-03-16Update project URL in SystemInfoChristian Muehlhaeuser1-1/+1
Pinetime -> InfiniTime
2021-03-15Small correction to git URL in documentation filesMartin Ashby6-11/+11
2021-03-15Removed unused variables. Tested.panky-codes3-9/+8
2021-03-13Increased the size of the button and realigned the layout a bit. Tested.panky-codes1-5/+7
2021-03-13Added some comments for clarity. Ready for review. Tested.panky-codes2-4/+16
2021-03-13Stopwatch completed. Ready for PRpanky-codes5-55/+75
2021-03-13Adding laps completed.panky-codes2-6/+17
2021-03-12Laps introduced. Tested. Need to change the icon.panky-codes2-7/+71
2021-03-12Added a button for stop lap. Logic works. Need to implement symbol and ↵panky-codes2-9/+58
buffer for lap
2021-03-11Added play/pause button.panky-codes2-9/+55
2021-03-11Changed the clock source. Stopwatch works. Need to add butttons.panky-codes2-12/+29
2021-03-11Merge branch 'develop' of github.com:JF002/Pinetime into feature/add-stop-watchpanky-codes4-48/+60
2021-03-11Basic logic done. Need to change the timer source to get ms. Also need to ↵panky-codes6-3/+114
replace with paddle app in displayApp.cpp and ApplicationList.cpp later.
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
This reverts commit 15484d0b34099b50c300b6f76e23f70f171bb409.
2021-03-07Add submodule again...Jean-François Milants3-1/+27
2021-03-07Merge branch 'develop' into recovery-firmwareJean-François Milants559-100328/+33649
# Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
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
Add link to README.md to WebBLEWatch to update time from web browser
2021-03-06Merge pull request #222 from nscooling/refactor-clock-private-staticsJF0022-39/+39
Moved private statics into unnamed namespace in cpp file
2021-03-06Merge pull request #221 from nscooling/C++14JF0021-9/+20
Refactored src/CMakelist to support C++14
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 ↵Niall Cooling2-39/+39
and uncessar in header
2021-03-03Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ↵Niall Cooling1-9/+20
-std= directives
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
Flash correct file name
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 ↵Jean-François Milants33-1342/+1170
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
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 20:27:28 +0000