summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings/Settings.cpp
AgeCommit message (Expand)AuthorFilesLines
2022-01-04Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekb...Jean-François Milants1-9/+6
2022-01-04Fix setting removing it self from wake settings when opening calibration wind...Tim Keller1-3/+3
2022-01-04Remove "fancy" settings display and always show ShakeWakeThresholdSettingTim Keller1-14/+10
2022-01-04Actually save the thresholdTim Keller1-1/+1
2022-01-04Add start of settings app for senstivity.Tim Keller1-1/+3
2022-01-02resolves conflictsSteveAmor1-1/+2
2022-01-02resolves conflictsSteveAmor1-1/+1
2021-12-05Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray1-1/+1
2021-11-15Update includes to to be relative to src directoryReinhold Gschweicher1-1/+1
2021-11-07Chimes optionSteveAmor1-1/+1
2021-10-20Restore settings orderKieran Cawthray1-2/+2
2021-10-18Fix settings merge errorKieran Cawthray1-2/+5
2021-10-18Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray1-0/+12
2021-10-10Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants1-5/+5
2021-10-03Remove old PineTimeStyle settings appKieran Cawthray1-18/+3
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0021-2/+17
2021-08-08Merge branch 'JF002:develop' into set-datetime-manuallyTim1-2/+2
2021-08-03Merge branch 'develop' into refresh_reworkRiku Isokoski1-2/+2
2021-07-28Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray1-2/+2
2021-07-25Add new unique icons for some appsRiku Isokoski1-2/+2
2021-07-24Add extra screen in settings to show scrollbar correctlyKieran Cawthray1-3/+3
2021-07-19Refresh reworkRiku Isokoski1-7/+0
2021-07-09Modified Settings menu as per suggestionTim Taenny1-4/+4
2021-07-09Added new menu entries to Settings pagetimaios1-2/+15
2021-06-24PineTimeStyle color picker initial commitKieran Cawthray1-0/+15
2021-06-10Minor improvements: use std::make_unique when creating unique_ptr, check the ...Jean-François Milants1-2/+2
2021-04-26Merge branch 'develop' ofJoaquim1-34/+27
2021-04-24Reformatted all the files according to clang-format styleAvamander1-30/+27
2021-04-19New Steps appJoaquim1-1/+1
2021-04-04Big UI and navigation RewriteJoaquim1-0/+69