Tim Daubenschütz
|
f78dbf9e1a
|
Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
Conflicts:
js/components/ascribe_forms/property.js
|
2015-09-14 14:23:36 +02:00 |
|
Tim Daubenschütz
|
e087e9f332
|
PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js
|
2015-09-14 11:36:24 +02:00 |
|
Tim Daubenschütz
|
356483f9ca
|
Fix bug for resetting non-native HTML inputs in form
|
2015-09-14 10:49:45 +02:00 |
|
Tim Daubenschütz
|
c8ece4c532
|
refactor contract creation form
|
2015-09-11 10:11:07 +02:00 |
|
diminator
|
01ebee87ec
|
form loan edit
|
2015-09-10 17:46:50 +02:00 |
|
diminator
|
6013303bd6
|
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
|
2015-09-10 17:45:51 +02:00 |
|
Tim Daubenschütz
|
b5e5102ea4
|
replace in keyword with dot notation checking
|
2015-09-10 14:00:59 +02:00 |
|
Tim Daubenschütz
|
5588f766c1
|
add reset functionality for InputDate and LoanForm
|
2015-09-10 13:24:32 +02:00 |
|
Tim Daubenschütz
|
9297f804fe
|
reset method for property collapsible
|
2015-09-10 11:35:39 +02:00 |
|
Tim Daubenschütz
|
1d184973f4
|
reset method for react s3 fineuploader
|
2015-09-10 11:22:42 +02:00 |
|
Tim Daubenschütz
|
c3b71b5398
|
WIP: make fineuploader an input
|
2015-09-10 10:51:47 +02:00 |
|
diminator
|
1c5b0c7172
|
only one agreement pending
agreement notifications per subdomain (only by whitelabel owner)
|
2015-09-09 19:29:58 +02:00 |
|
diminator
|
ec2ae39e15
|
contractagreement with PUT instead of PATCH
|
2015-09-09 13:53:03 +02:00 |
|
diminator
|
17f7be9257
|
contract list make public
|
2015-09-09 11:11:16 +02:00 |
|
diminator
|
e892becc50
|
contract settings update
|
2015-09-08 14:43:06 +02:00 |
|
diminator
|
9ad713f781
|
merge 456
|
2015-09-08 14:42:51 +02:00 |
|
Cevo
|
5b0cbc92ad
|
create refresh added, conflicts resolved
|
2015-09-08 11:57:20 +02:00 |
|
Cevo
|
a8fce698a6
|
createcontract refresh added
|
2015-09-08 11:53:09 +02:00 |
|
Tim Daubenschütz
|
2c1ad6dc46
|
fix bug in contract settings and expand actionpanel functionality
|
2015-09-08 11:19:11 +02:00 |
|
diminator
|
06ce603c44
|
list only is_active
|
2015-09-08 11:01:43 +02:00 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +02:00 |
|
diminator
|
6a1f58fdb4
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-03 17:37:40 +02:00 |
|
diminator
|
73ee0753c1
|
refactored notifications per detail
|
2015-09-03 17:25:22 +02:00 |
|
Tim Daubenschütz
|
85efa4b416
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-04 15:55:07 +02:00 |
|
Cevo
|
5265332901
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-03 15:53:22 +02:00 |
|
Cevo
|
d2f8b658af
|
contract listing being done
|
2015-09-03 15:53:02 +02:00 |
|
diminator
|
9334251fd3
|
notifications on piece details (www, ikono, cyland) and edition details
|
2015-09-03 15:17:12 +02:00 |
|
diminator
|
7f39c62130
|
create contract and agreement
|
2015-09-02 16:34:43 +02:00 |
|
diminator
|
19726560ba
|
bitbucket test
|
2015-09-02 14:39:32 +02:00 |
|
diminator
|
07ce180ff7
|
contract form POST
|
2015-09-02 13:57:41 +02:00 |
|
diminator
|
92971a9f62
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
Conflicts:
sass/ascribe_accordion_list.scss
|
2015-09-02 10:50:33 +02:00 |
|
diminator
|
bf5d1de635
|
update notification on request action
|
2015-09-01 19:14:48 +02:00 |
|
Tim Daubenschütz
|
9d7b5cbe2a
|
advance create contract form
|
2015-09-01 16:57:12 +02:00 |
|
Tim Daubenschütz
|
b4abe7a245
|
generic form submission determination for fineuploader
|
2015-09-01 14:42:09 +02:00 |
|
Tim Daubenschütz
|
96fdb598f7
|
change api endpoints to contractblobs
|
2015-08-31 17:29:43 +02:00 |
|
Tim Daubenschütz
|
dd20afff90
|
rename LoanContract to Contract
|
2015-08-28 16:18:10 +02:00 |
|
Tim Daubenschütz
|
d9f3f2a9d7
|
rename contract_form to form_contract
|
2015-08-28 15:55:39 +02:00 |
|
Tim Daubenschütz
|
8eec5d8f38
|
Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-28 12:44:02 +02:00 |
|
Tim Daubenschütz
|
9a9aa68ca9
|
fix lazy evalutaion of loan form
|
2015-08-28 11:13:28 +02:00 |
|
Tim Daubenschütz
|
86efb66663
|
add collapsible appendix to send contract form
|
2015-08-27 17:33:51 +02:00 |
|
Tim Daubenschütz
|
65148e24de
|
remove contract form from ikonotv codebase and integrate it into ascribe-core
|
2015-08-27 14:56:49 +02:00 |
|
diminator
|
bc28f3d8f5
|
loan request actions for multiple actions
|
2015-08-27 13:43:26 +02:00 |
|
diminator
|
79106dd106
|
loan request + answer complete
|
2015-08-27 11:38:21 +02:00 |
|
diminator
|
33d5480f2f
|
review comments
|
2015-08-27 10:10:39 +02:00 |
|
Tim Daubenschütz
|
b4f68f23e8
|
update react-datepicker DO NPM INSTALL
|
2015-08-26 18:03:58 +02:00 |
|
Tim Daubenschütz
|
6028812128
|
adjust loan form to disable dates
|
2015-08-26 18:01:50 +02:00 |
|
Tim Daubenschütz
|
e473b4c779
|
fix invariant violation
|
2015-08-26 17:32:42 +02:00 |
|
diminator
|
c64aae332d
|
Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an
|
2015-08-26 16:54:41 +02:00 |
|
diminator
|
6530149971
|
problem with loanForm
|
2015-08-26 16:34:41 +02:00 |
|
diminator
|
ab97fa420c
|
loan request with moment
shortlist on accordeonlist OK
|
2015-08-26 15:46:27 +02:00 |
|