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

Merge Develop to main #152

Merged
merged 21 commits into from
Mar 31, 2024
Merged

Merge Develop to main #152

merged 21 commits into from
Mar 31, 2024

Commits on Feb 25, 2024

  1. Update localization.h 

    Add Italian Language Setting
    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    96786a3 View commit details
    Browse the repository at this point in the history

  2. Update m5stick-nemo.ino 

    Add Italian Language
    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    b074f6f View commit details
    Browse the repository at this point in the history

  3. Update portal.h 

    Add Italian Language but I prefer portal in english
    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    bc8928b View commit details
    Browse the repository at this point in the history

  4. Update localization.h 

    Add Italian Language Setting
    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    365e412 View commit details
    Browse the repository at this point in the history

  5. Squashed commit of the following: 

    commit bc8928b
Author: klamath <[email protected]>
Date:   Sun Feb 25 20:59:19 2024 +0100

    Update portal.h

    Add Italian Language but I prefer portal in english

commit 96786a3
Author: klamath <[email protected]>
Date:   Sun Feb 25 20:52:22 2024 +0100

    Update localization.h

    Add Italian Language Setting
    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    bae9377 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'patch-3' into patch-1

    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    d45fe38 View commit details
    Browse the repository at this point in the history

  7. translation fix 

    minor change
    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    1396c41 View commit details
    Browse the repository at this point in the history

  8. Update localization.h

    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    ecaa9db View commit details
    Browse the repository at this point in the history

  9. testa

    @klamath1977
    klamath1977 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    7400898 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. modificato: m5stick-nemo.ino 

    	modificato:             wifispam.h
    @klamath1977
    klamath1977 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    15b0f26 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Add LANGUAGE_FR_FR localization

    @9Ri7
    9Ri7 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    df371b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. Fix color scheme EEPROM, change clock to 7-segment font

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    2a9fb52 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into LCDClock

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    34f1eda View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into LCDClock

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    5687715 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #151 from n0xa/LCDClock 

    Fix color scheme EEPROM, change clock to 7-segment font
    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    6febec8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #127 from 9Ri7/develop 

    Add LANGUAGE_FR_FR localization
    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    bc295e8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into patch-1

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    b703c11 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #117 from klamath1977/patch-1 

    Update localization.h
    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    7d8d256 View commit details
    Browse the repository at this point in the history

  8. Cleanup

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    70cf616 View commit details
    Browse the repository at this point in the history

  9. clear platform define

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    446f8b7 View commit details
    Browse the repository at this point in the history

  10. update contributors list

    @n0xa
    n0xa committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    33188fb View commit details
    Browse the repository at this point in the history