1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 16:48:04 +02:00
Commit Graph

7 Commits

Author SHA1 Message Date
Brett Sun
0f9e7cd3f6 Fix missing cases of getLangText 2016-02-08 14:50:24 +01:00
Brett Sun
37608004e3 Merge pull request #78 from ascribe/AD-1521-refactor-property-padding
Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
2016-02-04 15:15:01 +01:00
Brett Sun
4624e936b3 Use the new history api and its LocationDescriptors 2016-01-05 17:27:25 +01:00
Brett Sun
bf244e2bfa Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
Avoids having to style all the collapsible Properties with
`padding-bottom: 0` to center labels when collapsed.
2015-12-16 19:03:01 +01:00
Brett Sun
38ef18a192 Hotfix for sending contract agreements without appendices 2015-12-11 11:15:17 +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
328d60b279 Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty 2015-12-03 15:22:37 +01:00