Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lower to sleep #1

Merged
merged 4 commits into from
Nov 14, 2021
Merged

Lower to sleep #1

merged 4 commits into from
Nov 14, 2021

Conversation

FintasticMan
Copy link
Owner

No description provided.

@FintasticMan FintasticMan merged commit e15a376 into Combined Nov 14, 2021
FintasticMan added a commit that referenced this pull request Dec 13, 2021
commit 6cf4a93
Merge: ae4b9e0 42a5cdb
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Thu Dec 9 22:41:29 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit ae4b9e0
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Dec 6 10:29:14 2021 +0100

    Include Colors.h

commit c00ad4a
Merge: 1b2a8a5 85a2530
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Dec 5 20:32:29 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 1b2a8a5
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Nov 16 18:18:56 2021 +0100

    Improve notification icon alignment

commit bea5c60
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Nov 16 18:10:34 2021 +0100

    Revert "Fix notification icon alignment"

    This reverts commit 29bb359.

commit 29bb359
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Nov 16 00:06:13 2021 +0100

    Fix notification icon alignment

commit 50406ad
Merge: 5a0cf8e 624429b
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Nov 15 22:21:11 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 5a0cf8e
Merge: 2fa63c7 a57fda6
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Nov 15 19:38:29 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 2fa63c7
Merge: 18e3cc7 2e7b51c
Author: kieranc <kieranc@gmail.com>
Date:   Mon Nov 15 19:21:35 2021 +0100

    Merge pull request #1 from Riksu9000/pts-settings-fix

    Close customizer menu with button in PTS

commit 2e7b51c
Author: Riku Isokoski <riksu9000@gmail.com>
Date:   Sat Nov 13 13:11:32 2021 +0200

    clang-format and clang-tidy PineTimeStyle

commit 39157f2
Author: Riku Isokoski <riksu9000@gmail.com>
Date:   Sat Nov 13 13:02:00 2021 +0200

    Close menu with button

commit 18e3cc7
Merge: 85d494a 4a5b5f9
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Nov 7 17:49:54 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 85d494a
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sat Oct 23 18:12:41 2021 +0200

    Revert "Update GetNext/GetPrevious"

    This reverts commit 411c10e.

commit da97a94
Merge: 411c10e 9538eb9
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sat Oct 23 18:00:47 2021 +0200

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 411c10e
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 18:07:08 2021 +0200

    Update GetNext/GetPrevious

commit 3ed01b3
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 17:44:10 2021 +0200

    Improve random color selection, disable longpress when settings are visible

commit 32978b6
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 15:36:28 2021 +0200

    Restore settings order

commit 37eed43
Merge: 074d342 f45e094
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 11:30:42 2021 +0200

    Merge branch 'pts-settings' of https://github.com/kieranc/InfiniTime into pts-settings

commit 074d342
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 11:30:06 2021 +0200

    Ensure needle color is visible on reset/randomize

commit f45e094
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 11:25:06 2021 +0200

    Ensure needle color is visible one reset/randomize

commit 994f373
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Oct 19 00:22:45 2021 +0200

    Change gauge needle color when background is white

commit 1c3372b
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 23:29:41 2021 +0200

    Fix settings merge error

commit ff1fce1
Merge: c4ab17f ab7c6e1
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 23:14:39 2021 +0200

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit c4ab17f
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 23:04:12 2021 +0200

    Disable DoubleTap when settings buttons are displayed

commit 1c86796
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 22:52:53 2021 +0200

    More duplicate color dodging

commit 7d1da9f
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Oct 3 20:11:04 2021 +0200

    Remove old PineTimeStyle settings app

commit 3320eae
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Oct 3 20:01:46 2021 +0200

    Initial commit
FintasticMan added a commit that referenced this pull request Dec 13, 2021
…face

Squashed commit of the following:

commit 6cf4a93
Merge: ae4b9e0 42a5cdb
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Thu Dec 9 22:41:29 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit ae4b9e0
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Dec 6 10:29:14 2021 +0100

    Include Colors.h

commit c00ad4a
Merge: 1b2a8a5 85a2530
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Dec 5 20:32:29 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 1b2a8a5
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Nov 16 18:18:56 2021 +0100

    Improve notification icon alignment

commit bea5c60
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Nov 16 18:10:34 2021 +0100

    Revert "Fix notification icon alignment"

    This reverts commit 29bb359.

commit 29bb359
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Nov 16 00:06:13 2021 +0100

    Fix notification icon alignment

commit 50406ad
Merge: 5a0cf8e 624429b
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Nov 15 22:21:11 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 5a0cf8e
Merge: 2fa63c7 a57fda6
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Nov 15 19:38:29 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 2fa63c7
Merge: 18e3cc7 2e7b51c
Author: kieranc <kieranc@gmail.com>
Date:   Mon Nov 15 19:21:35 2021 +0100

    Merge pull request #1 from Riksu9000/pts-settings-fix

    Close customizer menu with button in PTS

commit 2e7b51c
Author: Riku Isokoski <riksu9000@gmail.com>
Date:   Sat Nov 13 13:11:32 2021 +0200

    clang-format and clang-tidy PineTimeStyle

commit 39157f2
Author: Riku Isokoski <riksu9000@gmail.com>
Date:   Sat Nov 13 13:02:00 2021 +0200

    Close menu with button

commit 18e3cc7
Merge: 85d494a 4a5b5f9
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Nov 7 17:49:54 2021 +0100

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 85d494a
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sat Oct 23 18:12:41 2021 +0200

    Revert "Update GetNext/GetPrevious"

    This reverts commit 411c10e.

commit da97a94
Merge: 411c10e 9538eb9
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sat Oct 23 18:00:47 2021 +0200

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit 411c10e
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 18:07:08 2021 +0200

    Update GetNext/GetPrevious

commit 3ed01b3
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 17:44:10 2021 +0200

    Improve random color selection, disable longpress when settings are visible

commit 32978b6
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 15:36:28 2021 +0200

    Restore settings order

commit 37eed43
Merge: 074d342 f45e094
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 11:30:42 2021 +0200

    Merge branch 'pts-settings' of https://github.com/kieranc/InfiniTime into pts-settings

commit 074d342
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 11:30:06 2021 +0200

    Ensure needle color is visible on reset/randomize

commit f45e094
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Wed Oct 20 11:25:06 2021 +0200

    Ensure needle color is visible one reset/randomize

commit 994f373
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Tue Oct 19 00:22:45 2021 +0200

    Change gauge needle color when background is white

commit 1c3372b
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 23:29:41 2021 +0200

    Fix settings merge error

commit ff1fce1
Merge: c4ab17f ab7c6e1
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 23:14:39 2021 +0200

    Merge remote-tracking branch 'upstream/develop' into pts-settings

commit c4ab17f
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 23:04:12 2021 +0200

    Disable DoubleTap when settings buttons are displayed

commit 1c86796
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Mon Oct 18 22:52:53 2021 +0200

    More duplicate color dodging

commit 7d1da9f
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Oct 3 20:11:04 2021 +0200

    Remove old PineTimeStyle settings app

commit 3320eae
Author: Kieran Cawthray <kieranc@gmail.com>
Date:   Sun Oct 3 20:01:46 2021 +0200

    Initial commit
FintasticMan pushed a commit that referenced this pull request Dec 13, 2021
Close customizer menu with button in PTS
FintasticMan pushed a commit that referenced this pull request Jan 5, 2022
Changed name of iOS companion app
FintasticMan pushed a commit that referenced this pull request Oct 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant