1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
onion/js
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
..
actions Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio 2015-12-07 11:49:39 +01:00
components Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 2015-12-07 13:39:30 +01:00
constants Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 2015-12-07 13:39:30 +01:00
fetchers Refactor webhooks: add source, clear state on create hide create on no items left 2015-11-27 13:36:42 +01:00
mixins Finalize ReactError component 2015-12-07 11:48:28 +01:00
models Finalize ReactError component 2015-12-07 11:48:28 +01:00
sources Refactor webhooks: add source, clear state on create hide create on no items left 2015-11-27 13:36:42 +01:00
stores Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio 2015-12-07 11:49:39 +01:00
third_party Add Facebook Share button 2015-11-09 17:46:49 +01:00
utils Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 2015-12-07 13:39:30 +01:00
alt.js Separate dispatcher logic of whitelabel and user stores 2015-10-07 09:31:38 +02:00
app.js Introduce ReactError mixin for handling errors in React components 2015-11-30 18:23:03 +01:00
history.js Restore baseUrl in router 2015-10-13 14:19:08 +02:00
routes.js Redirect directly to /login on loggout 2015-10-16 13:01:54 +02:00