cuts staging from master #939

Merged
jessopb merged 11 commits from master into staging 2019-02-26 17:58:26 +01:00

11 commits

Author SHA1 Message Date
jessopb
a5700be902
Merge pull request #935 from jessopb/licenseDev2
Adds License and LicenseUrl to AssetInfo and Publish/Edit Forms
2019-02-26 03:44:02 -05:00
jessopb
b107346c28
Merge branch 'master' into licenseDev2 2019-02-26 03:32:34 -05:00
jessopb
117ffa68a5
Merge pull request #938 from jessopb/waitOnBroke
replaces wait-on
2019-02-26 03:28:55 -05:00
jessopb
3cd7b6080d
Merge pull request #933 from jessopb/croppingSafe
documents and validates image resize
2019-02-26 03:28:32 -05:00
jessop
7b7a0339b8 licenseUrl shows on edit publish 2019-02-26 03:12:11 -05:00
jessop
4c37a6311f documents and validates image resize 2019-02-26 03:03:31 -05:00
jessop
f8662dddb1 replaces wait-on 2019-02-26 02:27:09 -05:00
jessopb
0d04659498
Update README.md 2019-02-25 20:59:46 -05:00
jessop
7d5e41153e adds licenseUrl 2019-02-23 00:52:31 -05:00
jessopb
a2c87af728
Merge pull request #932 from jessopb/handlbars
patch vulnerability
2019-02-22 16:32:03 -05:00
jessop
739127e44f patch vulnerability 2019-02-22 15:20:49 -05:00