Code

Support populate blueprints#103

Code

Open

kmcgrath wants to merge 35 commits intotrailsjs:mastertrailsjs/sails-permissions:masterfrom kmcgrath:feature/findTargetObjects-populatekmcgrath/sails-permissions:feature/findTargetObjects-populateCopy head branch name to clipboard

+94-20

Commits

Commits on Jul 29, 2015

• use populate function if the actioin is add

  kmcgrath

  committed
  60ae0d8

  Copy full SHA for 60ae0d8

• also check for remove

  kmcgrath

  committed
  699caa2

  Copy full SHA for 699caa2

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  83c6e66

  Copy full SHA for 83c6e66

• here until PR 101 is merged

  kmcgrath

  committed
  38d3886

  Copy full SHA for 38d3886

Commits on Jul 30, 2015

• also look for populate action

  kmcgrath

  committed
  8236611

  Copy full SHA for 8236611

• also need to check for populate action

  kmcgrath

  committed
  2f2906c

  Copy full SHA for 2f2906c

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  7d14a9e

  Copy full SHA for 7d14a9e

• need to return the parent record

  kmcgrath

  committed
  ffa49e4

  Copy full SHA for ffa49e4

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

  kmcgrath

  committed
  7c7b54e

  Copy full SHA for 7c7b54e

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  8e4b5ea

  Copy full SHA for 8e4b5ea

• when working with relations, check the primary object and proceed. TODOs for checking relations

  kmcgrath

  committed
  482dea9

  Copy full SHA for 482dea9

• typo

  kmcgrath

  committed
  3986b8c

  Copy full SHA for 3986b8c

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  09dd70b

  Copy full SHA for 09dd70b

• Merge branch 'feature/permission-without-criteria'

  kmcgrath

  committed
  3d43279

  Copy full SHA for 3d43279

Commits on Jul 31, 2015

• if the action is populate, load the permissions for the relation and apply to output

  kmcgrath

  committed
  902d12b

  Copy full SHA for 902d12b

• use the error message string

  kmcgrath

  committed
  452ffb4

  Copy full SHA for 452ffb4

• merge

  kmcgrath

  committed
  9e57dc0

  Copy full SHA for 9e57dc0

• Merge branch 'feature/permission-without-criteria'

  kmcgrath

  committed
  5389c15

  Copy full SHA for 5389c15

• fix from merge

  kmcgrath

  committed
  667a826

  Copy full SHA for 667a826

• add populate check

  kmcgrath

  committed
  07eee0c

  Copy full SHA for 07eee0c

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  7f9ac86

  Copy full SHA for 7f9ac86

Commits on Aug 1, 2015

• Merge branch 'feature/permission-without-criteria'

  kmcgrath

  committed
  29a3889

  Copy full SHA for 29a3889

• Merge branch 'feature/permission-without-criteria'

  kmcgrath

  committed
  fab2d9e

  Copy full SHA for fab2d9e

Commits on Aug 3, 2015

• Merge branch 'feature/permission-without-criteria'

  kmcgrath

  committed
  5909a69

  Copy full SHA for 5909a69

Commits on Aug 5, 2015

• Merge branch 'master' of https://github.com/tjwebb/sails-permissions into feature/findTargetObjects-populate

  Show description for f0c2f26
  kmcgrath

  committed
  f0c2f26

  Copy full SHA for f0c2f26

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  eb3b32c

  Copy full SHA for eb3b32c

• Merge branch 'feature/permission-without-criteria'

  kmcgrath

  committed
  1f5d9c7

  Copy full SHA for 1f5d9c7

• fix merge

  kmcgrath

  committed
  fd08636

  Copy full SHA for fd08636

• Merge branch 'feature/findTargetObjects-populate'

  kmcgrath

  committed
  04b0fde

  Copy full SHA for 04b0fde

Commits on Aug 31, 2015

• merge with upstream master

  kmcgrath

  committed
  362d935

  Copy full SHA for 362d935

Commits on Sep 1, 2015

• use updated function from commit 872fb94

  kmcgrath

  committed
  d49a889

  Copy full SHA for d49a889

Commits on Sep 9, 2015

• merge with upstream master

  kmcgrath

  committed
  a8f2509

  Copy full SHA for a8f2509

Commits on Sep 10, 2015

• Merge branch 'master' of https://github.com/tjwebb/sails-permissions into feature/findTargetObjects-populate

  kmcgrath

  committed
  50f3e3f

  Copy full SHA for 50f3e3f

Commits on Nov 11, 2015

• merge with upstream master

  kmcgrath

  committed
  bc09712

  Copy full SHA for bc09712

Commits on Oct 18, 2016

• Merge branch 'master' into feature/findTargetObjects-populate

  kmcgrath

  committed
  cb373d2

  Copy full SHA for cb373d2