ddejongh 41d70a9a15 Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar ...

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss

2015-06-23 16:07:17 +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

form_consign.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

form_delete_edition.js

Rename fetch to requests to avoid name clashing

2015-06-16 13:48:48 +02:00

form_loan.js

Finish implementing refactor for open and close for edition lists

2015-06-15 09:29:34 +02:00

form_login.js

password reset

2015-06-15 15:28:53 +02:00

form_note_edition.js

edition note

2015-06-16 16:38:22 +02:00

form_note_personal.js

csrf subdomain

2015-06-16 14:49:00 +02:00

form_password_reset_request.js

form password + signup

2015-06-11 17:22:11 +02:00

form_password_reset.js

password reset ok

2015-06-15 16:56:17 +02:00

form_piece_extradata.js

edition detail updated with forms

2015-06-22 23:32:41 +02:00

form_remove_editions_from_collection.js

Rename fetch to requests to avoid name clashing

2015-06-16 13:48:48 +02:00

form_request_action.js

replace amazon links

2015-06-16 09:59:09 +02:00

form_share_email.js

resolve merge conflicts

2015-06-05 11:40:49 +02:00

form_signup.js

password reset

2015-06-15 15:28:53 +02:00

form_transfer.js

resolve merge conflicts

2015-06-05 11:40:49 +02:00

form_unconsign_request.js

resolve merge conflicts

2015-06-05 11:40:49 +02:00

form_unconsign.js

consign unconsign requests

2015-06-11 15:03:55 +02:00

form.js

localization

2015-06-23 16:02:48 +02:00

input_checkbox.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

input_date.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

input_hidden.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

input_text.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

input_textarea_toggable.js

edition detail updated with forms

2015-06-22 23:32:41 +02:00

input_textarea.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

property.js

edition detail updated with forms

2015-06-22 23:32:41 +02:00