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 sails hook's model #54

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

merge sails hook's model #54

wants to merge 15 commits into from

Commits on May 26, 2018

  1. merge sails models again, in order to add hook`s model before init al… 

    …l models.
    @iamcxa
    iamcxa committed May 26, 2018
    Configuration menu
    Copy the full SHA
    3a092a0 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2018

  1. fix merge function

    @iamcxa
    iamcxa committed May 29, 2018
    Configuration menu
    Copy the full SHA
    e57a5ff View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. Merge pull request #2 from KSDaemon/master 

    merge
    @iamcxa
    iamcxa authored Sep 25, 2018
    Configuration menu
    Copy the full SHA
    3c46059 View commit details
    Browse the repository at this point in the history

  2. Update index.js

    @iamcxa
    iamcxa authored Sep 25, 2018
    Configuration menu
    Copy the full SHA
    68915ce View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2018

  1. Merge pull request #3 from KSDaemon/master 

    Npm up
    @iamcxa
    iamcxa authored Dec 26, 2018
    Configuration menu
    Copy the full SHA
    77bc0ff View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2019

  1. Merge pull request #4 from KSDaemon/master 

    update
    @iamcxa
    iamcxa authored Apr 25, 2019
    Configuration menu
    Copy the full SHA
    01774bb View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. Merge pull request #5 from KSDaemon/master 

    pull new version back
    @iamcxa
    iamcxa authored Jul 8, 2019
    Configuration menu
    Copy the full SHA
    b4c79a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. refactor: 💡 fallback

    @iamcxa
    iamcxa committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    3346737 View commit details
    Browse the repository at this point in the history

  2. lock sequelize version to ^4.39.0

    @iamcxa
    iamcxa authored Mar 28, 2020
    Configuration menu
    Copy the full SHA
    64cc4a2 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2021

  1. Merge branch 'master' of https://github.com/KSDaemon/sails-hook-seque… 

    …lize into KSDaemon-master
    @iamcxa
    iamcxa committed May 16, 2021
    Configuration menu
    Copy the full SHA
    343249e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from MoreAppio/KSDaemon-master 

    Ks daemon master
    @iamcxa
    iamcxa authored May 16, 2021
    Configuration menu
    Copy the full SHA
    74d26ef View commit details
    Browse the repository at this point in the history

  3. Revert "Ks daemon master"

    @iamcxa
    iamcxa authored May 16, 2021
    Configuration menu
    Copy the full SHA
    a8ba37f View commit details
    Browse the repository at this point in the history

Commits on May 27, 2021

  1. Merge pull request #9 from MoreAppio/revert-7-KSDaemon-master 

    Revert "Ks daemon master"
    @iamcxa
    iamcxa authored May 27, 2021
    Configuration menu
    Copy the full SHA
    2c96a74 View commit details
    Browse the repository at this point in the history

  2. Revert "merge from the source"

    @iamcxa
    iamcxa authored May 27, 2021
    Configuration menu
    Copy the full SHA
    9ce81cd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #10 from MoreAppio/revert-6-master 

    Revert "merge from the source"
    @iamcxa
    iamcxa authored May 27, 2021
    Configuration menu
    Copy the full SHA
    6e436ae View commit details
    Browse the repository at this point in the history