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

chore: update develop branch with master bugfixes #965

Merged

Commits on Feb 14, 2022

  1. Configuration menu
    Copy the full SHA
    ebf7486 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. Configuration menu
    Copy the full SHA
    359b20e View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2022

  1. Merge branch 'main/develop' into main/master

    # Conflicts:
    #	.github/workflows/publish_docker.yml
    #	package-lock.json
    #	package.json
    #	src/components/charts/TempChart.vue
    #	src/components/panels/GcodefilesPanel.vue
    #	src/locales/da.json
    #	src/locales/pl.json
    #	src/store/printer/tempHistory/actions.ts
    meteyou committed Jun 11, 2022
    Configuration menu
    Copy the full SHA
    ae68b49 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    87a9854 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4c7ec84 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2022

  1. locale(ko-kr): fix Korean localization (mainsail-crew#890)

    * fix Korean localization
    * Update ko-kr.json
    * locale(ko-kr): prettier format locale file
    ZISQO authored Jun 12, 2022
    Configuration menu
    Copy the full SHA
    a30a001 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    04159fc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    94338ba View commit details
    Browse the repository at this point in the history
  4. locale(ko-kr): update Korean localization (mainsail-crew#894)

    Co-authored-by: th33xitus <[email protected]>
    Co-authored-by: Stefan Dej <[email protected]>
    3 people authored Jun 12, 2022
    Configuration menu
    Copy the full SHA
    5029f4d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. Merge branch 'main/develop' into main/master

    # Conflicts:
    #	src/locales/ko-kr.json
    #	src/locales/zh.json
    meteyou committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    8a000e3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1e62b5b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2022

  1. Configuration menu
    Copy the full SHA
    6b6ca69 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Configuration menu
    Copy the full SHA
    64f12f7 View commit details
    Browse the repository at this point in the history