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

Support populate blueprints #103

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

Support populate blueprints #103

wants to merge 35 commits into from

Commits on Jul 29, 2015

  1. use populate function if the actioin is add

    @kmcgrath
    kmcgrath committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    60ae0d8 View commit details
    Browse the repository at this point in the history

  2. also check for remove

    @kmcgrath
    kmcgrath committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    699caa2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    83c6e66 View commit details
    Browse the repository at this point in the history

  4. here until PR 101 is merged

    @kmcgrath
    kmcgrath committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    38d3886 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. also look for populate action

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    8236611 View commit details
    Browse the repository at this point in the history

  2. also need to check for populate action

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    2f2906c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    7d14a9e View commit details
    Browse the repository at this point in the history

  4. need to return the parent record

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    ffa49e4 View commit details
    Browse the repository at this point in the history

  5. check that populate works, then load the parent object for the target

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    7c7b54e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    8e4b5ea View commit details
    Browse the repository at this point in the history

  7. when working with relations, check the primary object and proceed. TO… 

    …DOs for checking relations
    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    482dea9 View commit details
    Browse the repository at this point in the history

  8. typo

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    3986b8c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    09dd70b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/permission-without-criteria'

    @kmcgrath
    kmcgrath committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    3d43279 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. if the action is populate, load the permissions for the relation and … 

    …apply to output
    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    902d12b View commit details
    Browse the repository at this point in the history

  2. use the error message string

    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    452ffb4 View commit details
    Browse the repository at this point in the history

  3. merge

    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    9e57dc0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/permission-without-criteria'

    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    5389c15 View commit details
    Browse the repository at this point in the history

  5. fix from merge

    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    667a826 View commit details
    Browse the repository at this point in the history

  6. add populate check

    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    07eee0c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    7f9ac86 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2015

  1. Merge branch 'feature/permission-without-criteria'

    @kmcgrath
    kmcgrath committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    29a3889 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/permission-without-criteria'

    @kmcgrath
    kmcgrath committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    fab2d9e View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2015

  1. Merge branch 'feature/permission-without-criteria'

    @kmcgrath
    kmcgrath committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    5909a69 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2015

  1. Merge branch 'master' of https://github.com/tjwebb/sails-permissions … 

    …into feature/findTargetObjects-populate

Conflicts:
	api/services/PermissionService.js
    @kmcgrath
    kmcgrath committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    f0c2f26 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    eb3b32c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/permission-without-criteria'

    @kmcgrath
    kmcgrath committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    1f5d9c7 View commit details
    Browse the repository at this point in the history

  4. fix merge

    @kmcgrath
    kmcgrath committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    fd08636 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/findTargetObjects-populate'

    @kmcgrath
    kmcgrath committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    04b0fde View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. merge with upstream master

    @kmcgrath
    kmcgrath committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    362d935 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. use updated function from commit 872fb94

    @kmcgrath
    kmcgrath committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    d49a889 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. merge with upstream master

    @kmcgrath
    kmcgrath committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    a8f2509 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2015

  1. Merge branch 'master' of https://github.com/tjwebb/sails-permissions … 

    …into feature/findTargetObjects-populate
    @kmcgrath
    kmcgrath committed Sep 10, 2015
    Configuration menu
    Copy the full SHA
    50f3e3f View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. merge with upstream master

    @kmcgrath
    kmcgrath committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    bc09712 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2016

  1. Merge branch 'master' into feature/findTargetObjects-populate

    @kmcgrath
    kmcgrath committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    cb373d2 View commit details
    Browse the repository at this point in the history