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

Fix (master/develop) branch checkout from config-general #8399

Merged
merged 25 commits into from
Sep 1, 2020
Merged

Fix (master/develop) branch checkout from config-general #8399

merged 25 commits into from
Sep 1, 2020

Commits on Aug 26, 2020

  1. Add apiv2 config operation route, for switching branch.

    @p0psicles
    p0psicles committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    78aeab7 View commit details
    Browse the repository at this point in the history

  2. Do not initiate a restart.

    @p0psicles
    p0psicles committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    cb7b46b View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. Change notification message.

    @p0psicles
    p0psicles committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    12c1494 View commit details
    Browse the repository at this point in the history

  2. Remove updating from log message. 

    * It's a backup, not necessarily used for updates.
    @p0psicles
    p0psicles committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    dda0ffa View commit details
    Browse the repository at this point in the history

  3. github_updater.py: Add set-remote, to also be able to update other br… 

    …anches then master / develop.

* Fix missing import.
    @p0psicles
    p0psicles committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    db87366 View commit details
    Browse the repository at this point in the history

  4. Fix checking out branch. 

    * Only check dbUpgrade for master and develop (current) branch.
    @p0psicles
    p0psicles committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    a28340b View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. Disable the actual switch branch.

    @p0psicles
    p0psicles committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    1152059 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2020

  1. Move Restart to vue component 

    * Add apiv2 route for system operation calls.
* Add restart as first operation
    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    b423d22 View commit details
    Browse the repository at this point in the history

  2. Move shutdown to apiv2.

    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    803d785 View commit details
    Browse the repository at this point in the history

  3. Remove all the commended code. 

    This should make it end-2-end functional.
    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    fdc2686 View commit details
    Browse the repository at this point in the history

  4. Add modal.css

    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    b4ec23b View commit details
    Browse the repository at this point in the history

  5. increase timeout.

    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    6226c1c View commit details
    Browse the repository at this point in the history

  6. Remove result, as i'm not using it "yet".

    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    cad4b9c View commit details
    Browse the repository at this point in the history

  7. remove restart.mako

    @p0psicles
    p0psicles committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    9d5a9a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. Add restart.vue component. 

    * Fix lint errors
    @p0psicles
    p0psicles committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    45600ee View commit details
    Browse the repository at this point in the history

  2. Move operation 'CHECKOUT_BRANCH' to system handler.

    @p0psicles
    p0psicles committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    567aa0f View commit details
    Browse the repository at this point in the history

  3. Fix remote github branches sometime not loading. 

    Race issue.
    @p0psicles
    p0psicles committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    1f88010 View commit details
    Browse the repository at this point in the history

  4. Fix system handler.

    @p0psicles
    p0psicles committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    f070992 View commit details
    Browse the repository at this point in the history

  5. Fix lint errors

    @p0psicles
    p0psicles committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    9e6bafb View commit details
    Browse the repository at this point in the history

  6. Revert trailing comma.

    @p0psicles
    p0psicles committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    4afe53f View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. Fix git branches not shown when navigating from other page through ro… 

    …uter to config-general.vue
    @p0psicles
    p0psicles committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    c2a84c6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/pymedusa/Medusa into fea… 

    …ture/vueify-branch-checkout

# Conflicts:
#	themes/dark/assets/js/medusa-runtime.js
#	themes/light/assets/js/medusa-runtime.js
    @p0psicles
    p0psicles committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    ecc8435 View commit details
    Browse the repository at this point in the history

  3. bundle runtime

    @p0psicles
    p0psicles committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    1408f3d View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. (re)load the default page after a restart. 

    For the theme reload. Reload and force getting data from backend.
    @p0psicles
    p0psicles committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    24d5b96 View commit details
    Browse the repository at this point in the history

  2. fix hard browser reload on chrome

    @p0psicles
    p0psicles committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    d8c2995 View commit details
    Browse the repository at this point in the history