tim
abebbe2e51
Hide button and spinner in form instead of replace
2016-04-21 13:27:55 +02:00
Brett Sun
55f53247ea
Merge pull request #174 from ascribe/fix-digital-work-file-name
...
Use setTimeout instead of setInterval to refresh signed download urls
2016-03-10 15:32:37 +01:00
Brett Sun
65c37b2c74
Use setTimeout instead of setInterval to refresh signed download urls
2016-03-10 12:06:58 +01:00
Tim Daubenschütz
5b79648385
Merge pull request #153 from ascribe/fix-digital-work-file-name
...
Fix digital work file name download
2016-03-03 10:05:13 +01:00
Tim Daubenschütz
64d0dd008e
Correct timer variable name
2016-03-03 10:04:45 +01:00
Tim Daubenschütz
e863349531
Refactor to comply with PR feedback
2016-03-01 12:55:27 +01:00
Tim Daubenschütz
b2a21c5cc1
Resign url based on setInterval
2016-02-22 17:38:02 +01:00
Tim Daubenschütz
23efaa368e
Apply PR feedback
2016-02-22 12:18:40 +01:00
Tim Daubenschütz
f2c7f02480
Add component for signing S3 url
2016-02-17 11:38:01 +01:00
Tim Daubenschütz
dad4ea4e87
Merge pull request #107 from ascribe/cosmetic-fix-for-multiline-destructure
...
Update multiline destructuring format based on style guide
2016-02-09 09:27:26 +01:00
Brett Sun
0f9e7cd3f6
Fix missing cases of getLangText
2016-02-08 14:50:24 +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
349ea8518f
Destructure params for fetchEditionList
2015-12-08 14:55:04 +01:00
Brett Sun
f82797bea3
Move compnentDidUpdate for ESLint warning
2015-12-08 14:48:44 +01:00
Tim Daubenschütz
49421e1fa1
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
...
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_forms/property.js
js/components/ascribe_forms/property_collapsible.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
sass/ascribe-fonts/ascribe-fonts.scss
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
2015-12-07 13:39:30 +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
e4cafd4bc3
Fix bug in FB button component & simplify injectHead util
2015-11-23 19:02:28 +01:00
Tim Daubenschütz
59244f208a
Fix detachment of DOM <-> browser state
2015-11-23 13:59:07 +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
f2555aefcc
Add email prop to loan and consign button
2015-11-03 11:12:04 +01:00
Brett Sun
05e3069240
Add propTypes to acl buttons
2015-11-02 18:44:09 +01:00
Brett Sun
fe06ea607f
Remove unnecessary default props
2015-11-02 15:20:02 +01:00
Brett Sun
6c8016e094
Remove misleading editions prop to pieceOrEditions
2015-11-02 15:19:52 +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
Brett Sun
c242cffdbd
Bring over changes for acl_button from Lumenus
2015-10-29 17:04:31 +01:00
Tim Daubenschütz
9765ed040b
Add tertiary button style
2015-10-27 17:15:23 +01:00
Tim Daubenschütz
12c7fa7ba4
Change delete button back to old styling
2015-10-27 16:32:26 +01:00
Tim Daubenschütz
3bf70628c1
Finalizing behavior of AclInformation
2015-10-23 11:24:26 +02:00
Tim Daubenschütz
cd3c8b8f6e
Complete visual styling
2015-10-23 10:37:23 +02:00
Tim Daubenschütz
e8a9cd89a4
Add resizing functionality to AclButtonList and AclInformation
2015-10-23 09:29:17 +02:00
Tim Daubenschütz
d4de2434ee
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
...
Conflicts:
js/components/ascribe_forms/form_share_email.js
js/components/ascribe_forms/form_transfer.js
js/utils/general_utils.js
sass/main.scss
2015-10-22 13:38:49 +02:00
Tim Daubenschütz
a9fa60eaf2
Fix buttons for cc
2015-10-21 14:52:25 +02:00
Tim Daubenschütz
8d0e9a42fc
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
...
Conflicts:
package.json
2015-10-20 18:11:41 +02:00
Tim Daubenschütz
ddc2e7b919
Rename intersectAcls to intersectList and do some clean up
2015-10-20 18:10:48 +02:00
Tim Daubenschütz
8417c2781e
Making AclInformation more robust by adding checks for if the information to display is available
2015-10-20 18:00:59 +02:00
Tim Daubenschütz
beee069d3f
Minor layouting fixes
2015-10-20 15:51:22 +02:00
Tim Daubenschütz
22a95f07fd
Further cleanup
2015-10-20 15:10:18 +02:00
Tim Daubenschütz
f0d8e32ecf
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
Tim Daubenschütz
702f1d29f3
Styling
2015-10-15 11:41:46 +02:00
Tim Daubenschütz
d77bdb25a5
Cleanup code
2015-10-15 11:17:16 +02:00
