summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-09-28Alarm: Close the popup with information about the time until alarm with the b...Maxim Leshchenko2-0/+12
2021-09-28Set version to 1.6.0Jean-François Milants1-1/+1
2021-09-28Merge pull request #688 from danielgjackson/fix-advertising-18-hoursJF0021-1/+1
2021-09-26Set version to 1.5.0Jean-François Milants1-1/+1
2021-09-25Correctly return the tick at which the RF will be fully enabled.Daniel Jackson1-1/+1
2021-09-23Merge pull request #664 from Riksu9000/disable_notif_onlyJF0029-43/+19
2021-09-19Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants1-1/+1
2021-09-19Fix the display of the date after a reset : when the date/time was restored f...Jean-François Milants1-0/+1
2021-09-18Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...JF0021-1/+1
2021-09-18Merge branch 'geekbozu-PersistantStorage' into developJean-François Milants9-8/+100
2021-09-18Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into...Jean-François Milants9-8/+100
2021-09-18Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2-0/+3
2021-09-18Merge pull request #662 from mruss77/basic-alarm-appJF00214-2/+537
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell33-232/+300
2021-09-16Revert "Merge upstream"Mark Russell33-300/+232
2021-09-16Merge upstreamMark Russell33-232/+300
2021-09-16Fixes per Riksu9000's feedbackMark Russell7-30/+27
2021-09-16Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher1-1/+1
2021-09-14Merge branch 'develop' into disable_notif_onlyRiku Isokoski8-69/+121
2021-09-14Merge pull request #658 from NeroBurner/patch-2JF0021-4/+4
2021-09-14Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_includeJF0021-1/+0
2021-09-13Remove unused include in MotoController.hReinhold Gschweicher1-1/+0
2021-09-13License header fix, add missing bracesMark Russell4-5/+22
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell5-89/+133
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2-13/+20
2021-09-13Merge branch 'develop' into disable_notif_onlyRiku Isokoski28-162/+177
2021-09-13Merge branch 'evergreen22-refactor_adv' into developJean-François Milants4-51/+97
2021-09-13Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into...Jean-François Milants4-51/+97
2021-09-13Merge pull request #549 from hubmartin/pinmapJF00216-92/+118
2021-09-13docs: Fix a few typos (#606)Tim Gates4-4/+4
2021-09-13Add WATCH_COLMI_P8 option to cmake & docshubmartin2-0/+10
2021-09-13Merge branch 'develop' into pinmaphubmartin17-86/+71
2021-09-12Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF0021-1/+1
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF0024-18/+2
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF0028-31/+38
2021-09-12Merge pull request #552 from Riksu9000/new_to_infinitimeJF0021-17/+7
2021-09-12Merge pull request #551 from hubmartin/patch-3JF0021-0/+4
2021-09-12Merge pull request #550 from hubmartin/patch-2JF0021-0/+4
2021-09-12Toggle notifications only, keep vibrations.Riku Isokoski9-43/+19
2021-09-11Merge pull request #615 from Utopiah/patch-1JF0021-0/+1
2021-09-11Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF0021-2/+2
2021-09-10Created basic alarm appMark Russell16-3/+480
2021-09-10Run CI on master and develop branchNeroBurner1-4/+4
2021-09-05Advertise fast for at least 30 secs then slow downJames A. Jerkins3-1/+20
2021-09-05Revert "Linear decrease of advert rate to conserve battery"James A. Jerkins2-6/+0
2021-09-04Linear decrease of advert rate to conserve batteryJames A. Jerkins2-0/+6
2021-09-02Add some commentsTim Keller1-2/+6
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-09-02Set version to 1.4.0.Jean-François Milants1-1/+1
2021-09-01Fix styles issues - no change to functionalityJames A. Jerkins1-6/+6