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.

Sign up for GitHub

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

Jump to bottom

WIP #2376

Draft
wants to merge 34 commits into
base: master
Choose a base branch
from
Draft

WIP #2376

wants to merge 34 commits into from

Commits on Jul 5, 2024

  1. WIP

    @sdottaka
    sdottaka committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    2040433 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'master' into syscolor-hook

    @sdottaka
    sdottaka committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    c33054e View commit details
    Browse the repository at this point in the history

  2. WIP

    @sdottaka
    sdottaka committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    25c5899 View commit details
    Browse the repository at this point in the history

  3. WIP

    @sdottaka
    sdottaka committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    559db13 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. WIP

    @sdottaka
    sdottaka committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    30a13ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into syscolor-hook

    @sdottaka
    sdottaka committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    125f8fb View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. WIP

    @sdottaka
    sdottaka committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    a4efe71 View commit details
    Browse the repository at this point in the history

  2. WIP

    @sdottaka
    sdottaka committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    24a80df View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Merge branch 'master' into syscolor-hook 

    # Conflicts:
#	Src/BasicFlatStatusBar.cpp
#	Src/BasicFlatStatusBar.h
#	Src/MergeStatusBar.cpp
    @sdottaka
    sdottaka committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    e9214e6 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Merge remote-tracking branch 'origin/master' into syscolor-hook 

    # Conflicts:
#	Src/Merge.vcxproj.filters
    @sdottaka
    sdottaka committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    94affca View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. WIP

    @sdottaka
    sdottaka committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    287c48f View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Merge remote-tracking branch 'origin/master' into commandbar

    @sdottaka
    sdottaka committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    875134b View commit details
    Browse the repository at this point in the history

  2. WIP

    @sdottaka
    sdottaka committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ac34f6b View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. WIP

    @sdottaka
    sdottaka committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    e842643 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'commandbar' into syscolor-hook

    @sdottaka
    sdottaka committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    281ed2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into syscolor-hook

    @sdottaka
    sdottaka committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    29882ee View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. WIP

    @sdottaka
    sdottaka committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    d07f58d View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. WIP

    @sdottaka
    sdottaka committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    67fc535 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into commandbar

    @sdottaka
    sdottaka committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    9b05201 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'commandbar' into syscolor-hook

    @sdottaka
    sdottaka committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    b965560 View commit details
    Browse the repository at this point in the history

  4. WIP

    @sdottaka
    sdottaka committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    c4b9f48 View commit details
    Browse the repository at this point in the history

  5. WIP

    @sdottaka
    sdottaka committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    5f69d87 View commit details
    Browse the repository at this point in the history

  6. WIP

    @sdottaka
    sdottaka committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a406814 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. WIP

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    e8071cc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'commandbar' into syscolor-hook

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    63dc5cf View commit details
    Browse the repository at this point in the history

  3. WIP

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    940dcbf View commit details
    Browse the repository at this point in the history

  4. WIP

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    9d37e04 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'commandbar' into syscolor-hook

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    0feacb1 View commit details
    Browse the repository at this point in the history

  6. WIP

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    fefe7e9 View commit details
    Browse the repository at this point in the history

  7. WIPMerge remote-tracking branch 'origin/syscolor-hook' into darkmode 

    # Conflicts:
#	Src/Merge.vcxproj.filters
    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    7fff29c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'commandbar' into syscolor-hook

    @sdottaka
    sdottaka committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    6c4c6e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Merge branch 'master' into syscolor-hook 

    # Conflicts:
#	Src/MenuBar.cpp
    @sdottaka
    sdottaka committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    638e671 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. WIP

    @sdottaka
    sdottaka committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    e6e3e2d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Merge branch 'master' into syscolor-hook

    @sdottaka
    sdottaka committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    e83cc07 View commit details
    Browse the repository at this point in the history