Commit Graph

16 Commits

Author SHA1 Message Date
tim 3230b0d8c0 Custom bokk ACL button 2016-11-07 17:47:13 +01:00
Brett Sun 8fce04125f Merge with master 2016-02-08 14:08:54 +01:00
Brett Sun 8ba9eb20b6 Add better PropType validation for components 2016-02-05 11:53:33 +01:00
Brett Sun 826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Brett Sun 2ad2ea242d Changes for PR comments 2016-01-18 17:31:56 +01:00
Brett Sun e5cae3fc34 Update multiline destructuring format based on style guide 2016-01-18 14:46:39 +01:00
Brett Sun d4bb00168c Change AclButtonList and parents for loading UserStore from top level app 2016-01-11 17:41:31 +01:00
Brett Sun efdc5d32e7 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark 2015-11-24 10:42:15 +01:00
Tim Daubenschütz ed3624198a Merge branch 'master' into AD-1309-change-share-to-email
Conflicts:
	js/components/ascribe_buttons/acls/acl_button.js
2015-11-16 16:55:33 +01:00
Tim Daubenschütz ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz a95dfe6439 Remove unused imports from AclButton 2015-11-16 13:49:40 +01:00
Brett Sun 84e8e4612f Autofocus message field in consignment form and use custom labels
For now, we’ll let the artist specify their suggested price in the
consignment form’s message field.
2015-11-10 18:24:46 +01:00
Brett Sun 3cfa65cb82 Change instances of "Share" to be "Email" 2015-11-10 11:53:05 +01:00
Brett Sun 56eff0d9ed Improve DRYness of acl buttons
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
2015-11-06 15:10:29 +01:00
Brett Sun fe06ea607f Remove unnecessary default props 2015-11-02 15:20:02 +01:00
Brett Sun 03e0bbd024 Separate form building concerns from AclButton
AclButton’s form building is now delegated to AclFormFactory so other
components can use the same forms with ease. Its show/hide behaviour is
also now controlled with AclProxy.
2015-10-30 11:10:31 +01:00