aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/settings/Settings.cpp
Commit message (Expand)AuthorAgeFilesLines
* resolves conflictsSteveAmor2022-01-021-1/+2
|\
| * Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-12-051-1/+1
| |\
| | * Update includes to to be relative to src directoryReinhold Gschweicher2021-11-151-1/+1
| * | Restore settings orderKieran Cawthray2021-10-201-2/+2
| * | Fix settings merge errorKieran Cawthray2021-10-181-2/+5
| * | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-181-0/+12
| |\|
| * | Remove old PineTimeStyle settings appKieran Cawthray2021-10-031-18/+3
* | | resolves conflictsSteveAmor2022-01-021-1/+1
* | | Chimes optionSteveAmor2021-11-071-1/+1
| |/ |/|
* | Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants2021-10-101-5/+5
|\ \ | |/ |/|
| * Merge branch 'JF002:develop' into set-datetime-manuallyTim2021-08-081-2/+2
| |\
| * | Modified Settings menu as per suggestionTim Taenny2021-07-091-4/+4
| * | Added new menu entries to Settings pagetimaios2021-07-091-2/+15
* | | Update Settings.cppItai Nelken2021-09-021-2/+2
* | | Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-281-2/+17
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-281-2/+2
| |\ \ \ | | | |/ | | |/|
| * | | Add extra screen in settings to show scrollbar correctlyKieran Cawthray2021-07-241-3/+3
| * | | PineTimeStyle color picker initial commitKieran Cawthray2021-06-241-0/+15
| | |/ | |/|
* | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-031-2/+2
|\ \ \ | | |/ | |/|
| * | Add new unique icons for some appsRiku Isokoski2021-07-251-2/+2
| |/
* / Refresh reworkRiku Isokoski2021-07-191-7/+0
|/
* Minor improvements: use std::make_unique when creating unique_ptr, check the ...Jean-François Milants2021-06-101-2/+2
* Merge branch 'develop' ofJoaquim2021-04-261-34/+27
|\
| * Reformatted all the files according to clang-format styleAvamander2021-04-241-30/+27
* | New Steps appJoaquim2021-04-191-1/+1
|/
* Big UI and navigation RewriteJoaquim2021-04-041-0/+69