Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Clear some merge conflicts and also some wrong merges. BAD GIT!!! Conflicts: js/components/ascribe_forms/property.js js/components/ascribe_uploader/react_s3_fine_uploader_utils.js sass/ascribe_uploader.scss		2015-09-15 13:30:24 +02:00
..
alert.js	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-	2015-06-09 16:10:38 +02:00
create_editions_form.js	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
form_consign.js	remove FormPropertyHeader	2015-08-06 10:23:01 +02:00
form_contract_agreement.js	only one agreement pending	2015-09-09 19:29:58 +02:00
form_create_contract.js	only one agreement pending	2015-09-09 19:29:58 +02:00
form_delete_edition.js	refactor form_delete_piece	2015-08-06 10:15:02 +02:00
form_delete_piece.js	remove FormPropertyHeader	2015-08-06 10:23:01 +02:00
form_loan_request_answer.js	loan request actions for multiple actions	2015-08-27 13:43:26 +02:00
form_loan.js	form loan edit	2015-09-10 17:46:50 +02:00
form_login.js	(hopefully) fix auto-fill bug for safari/chrome	2015-08-26 15:41:59 +02:00
form_piece_extradata.js	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
form_register_piece.js	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +02:00
form_remove_editions_from_collection.js	refactor form_remove_editions_from_collection	2015-08-06 10:31:51 +02:00
form_remove_piece_from_collection.js	refactor form_remove_piece_from_collection	2015-08-06 10:42:12 +02:00
form_request_action.js	refactored notifications per detail	2015-09-03 17:25:22 +02:00
form_share_email.js	minor changes	2015-08-06 10:58:09 +02:00
form_signup.js	fix submit to prize button	2015-08-10 10:10:43 +02:00
form_submit_to_prize.js	remove close button from modals	2015-08-05 18:00:44 +02:00
form_transfer.js	remove close button from modals	2015-08-05 18:00:44 +02:00
form_unconsign_request.js	minor changes	2015-08-06 10:58:09 +02:00
form_unconsign.js	remove close button from modals	2015-08-05 18:00:44 +02:00
form.js	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +02:00
input_checkbox.js	add lock/disabled functionality to form	2015-08-19 17:06:14 +02:00
input_date.js	add reset functionality for InputDate and LoanForm	2015-09-10 13:24:32 +02:00
input_fineuploader.js	reset method for react s3 fineuploader	2015-09-10 11:22:42 +02:00
input_textarea_toggable.js	reset method for property collapsible	2015-09-10 11:35:39 +02:00
list_form_request_actions.js	refactored notifications per detail	2015-09-03 17:25:22 +02:00
property_collapsible.js	reset method for property collapsible	2015-09-10 11:35:39 +02:00
property.js	PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js	2015-09-14 11:36:24 +02:00