summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
AgeCommit message (Expand)AuthorFilesLines
2021-09-23Merge pull request #664 from Riksu9000/disable_notif_onlyJF0022-7/+3
2021-09-18Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...JF0021-1/+1
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell4-13/+3
2021-09-16Revert "Merge upstream"Mark Russell4-3/+13
2021-09-16Merge upstreamMark Russell4-13/+3
2021-09-16Fixes per Riksu9000's feedbackMark Russell2-15/+19
2021-09-16Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher1-1/+1
2021-09-13License header fix, add missing bracesMark Russell2-2/+10
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell2-52/+92
2021-09-13Merge branch 'develop' into disable_notif_onlyRiku Isokoski3-11/+1
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF0022-9/+1
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF0021-2/+0
2021-09-12Toggle notifications only, keep vibrations.Riku Isokoski2-7/+3
2021-09-10Created basic alarm appMark Russell3-1/+257
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in previ...Jean-François Milants1-1/+0
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski73-302/+590
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants4-96/+79
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0026-16/+425
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski12-23/+15
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski18-141/+131
2021-08-19Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray1-1/+1
2021-08-19Remove unused variablesRiku Isokoski2-9/+1
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski14-269/+230
2021-08-18Fix music app buttonsRiku Isokoski1-1/+1
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray14-268/+229
2021-08-15Fix potential edge case of sidebar being set blackKieran Cawthray1-1/+1
2021-08-15More tidying following reviewKieran Cawthray1-85/+88
2021-08-15Avoid setting the sidebar blackKieran Cawthray1-0/+4
2021-08-15Remove duplicate code, minor fixesKieran Cawthray1-33/+19
2021-08-15Merge branch 'develop' into refresh_reworkRiku Isokoski13-167/+164
2021-08-15Add check for randomise button in case colors clashKieran Cawthray1-0/+5
2021-08-15Adjust inner padding in applistRiku Isokoski1-1/+1
2021-08-15Clean up using variablesRiku Isokoski1-10/+16
2021-08-15Adjust previously missed scrollbar and firmware validation buttonsRiku Isokoski2-11/+11
2021-08-15Ui updateRiku Isokoski9-107/+99
2021-08-15Add randomise button to color pickerKieran Cawthray2-0/+22
2021-08-14Merge branch 'develop' into timer_battery_readingRiku Isokoski5-152/+115
2021-08-14Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime i...Jean-François Milants4-55/+49
2021-08-14Merge branch 'develop' into refresh_reworkRiku Isokoski2-100/+69
2021-08-14Improve metronomeRiku Isokoski2-99/+68
2021-08-14Make battery reading periodic. Add events. Disable pullupRiku Isokoski1-3/+0
2021-08-12TidyingKieran Cawthray1-1/+0
2021-08-12Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray9-143/+54
2021-08-10Merge branch 'develop' into new_touch_handlerRiku Isokoski11-159/+65
2021-08-10Merge branch 'develop' into refresh_reworkRiku Isokoski9-148/+53
2021-08-10Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://...Jean-François Milants1-4/+4
2021-08-10Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, ...Jean-François Milants8-146/+50
2021-08-03Merge branch 'develop' into refresh_reworkRiku Isokoski20-91/+90
2021-08-01FixesRiku Isokoski2-10/+19