Brett Sun
|
30f0008a28
|
Hotfix for missed PieceListToolbarWidget style renaming
|
2016-02-09 10:46:18 +01:00 |
|
Brett Sun
|
d95bdc0913
|
Merge with master
|
2016-02-08 11:43:02 +01:00 |
|
Brett Sun
|
6f2424d103
|
Rebase remerge
|
2016-02-04 13:32:00 +01:00 |
|
Brett Sun
|
0d01ae1642
|
Remove unused btn-ascribe-add in PieceList
|
2016-01-27 15:01:08 +01:00 |
|
Brett Sun
|
efbc605fc8
|
Standardize render structure across main app and white label apps
Also fixes some whitelabel landing pages broken from the
standardization and removes unnecessary class names
|
2016-01-19 15:04:46 +01:00 |
|
Brett Sun
|
1ea89313ff
|
Add custom buttons to loan form for Cyland registration
|
2015-12-16 12:43:03 +01:00 |
|
Tim Daubenschütz
|
ddfdaa30e7
|
Merge fixes
|
2015-12-07 14:01: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 |
|
Tim Daubenschütz
|
5772a5ad49
|
Style thumbnail upload button for whitelabels
|
2015-12-03 13:29:37 +01:00 |
|
Brett Sun
|
78b8887fbf
|
Fix Cyland landing page
Fix font family to be Gibson, center vertically.
|
2015-12-03 12:44:12 +01:00 |
|
Brett Sun
|
d2529bf015
|
Merge with master
|
2015-11-03 10:39:01 +01:00 |
|
Tim Daubenschütz
|
1f7addb886
|
Adding whitelabel colors for AclInformation
|
2015-10-23 11:34:58 +02:00 |
|
Tim Daubenschütz
|
2b3f33cca0
|
Change button styles for whitelabel pages
|
2015-10-21 15:56:30 +02:00 |
|
diminator
|
74eb1ce3a2
|
spinner and some colors
***FML***
|
2015-10-16 13:30:36 +02:00 |
|
diminator
|
b54beae322
|
cyland
cc
|
2015-10-14 17:13:16 +02:00 |
|