Merge branch 'develop'

Welling Guzman committed on Feb 26, 2018, 11:58 AM

Showing 23 changed files +125 additions -42 deletions

M .github/ISSUE_TEMPLATE.md +1 -1

M api/api.php +1 -1

M api/core/Directus/Permissions/Acl.php +14

M api/core/Directus/Util/StringUtils.php +15 -2

M api/views/mail/base.twig +2 -2

M api/views/mail/user-invitation.twig +1 -1

M app/core/interfaces/_internals/permissions/edit-fields-modal.js +3 -2

M app/core/interfaces/_internals/permissions/table-row.handlebars +4 -4

M app/core/interfaces/_system/status/input.handlebars +1 -1

M app/core/interfaces/random/component.js +19 -1

M app/core/interfaces/random/interface.js +5 -3

M app/core/interfaces/tags/component.js +13

M app/core/interfaces/tags/input.handlebars +1 -1

M app/core/interfaces/tags/interface.js +8 -2

M app/core/interfaces/wysiwyg_full/interface.js +6 -4

M app/core/modals/user.js +1 -1

M app/helpers.js +6 -1

M app/helpers/string.js +5

M app/modules/tables/views/EditView.js +6 -4

M app/router.js +5 -5

M app/templates/core/widgets/save-widget.handlebars +2 -2

M app/templates/modules/settings/permissions-fields.handlebars +3 -3

M customs/extensions/_example/main.js +3 -1