Tim Daubenschütz
|
73c2a7c544
|
rename fineuploader's submitKey method to submitFile
|
2015-09-14 14:46:03 +02:00 |
|
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 |
|
TimDaubenschuetz
|
20fc877288
|
Merged in AD-931-allow-to-reset-form-after-submit (pull request #56)
Fix bug for resetting non-native HTML inputs in form
|
2015-09-14 11:48:48 +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
|
20001d5c20
|
Merge remote-tracking branch 'origin/master' into AD-931-allow-to-reset-form-after-submit
|
2015-09-14 10:51:18 +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 |
|
Tim Daubenschütz
|
535b2904b6
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-887-list-contracts-in-settings
|
2015-09-10 17:59:46 +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
|
4101cd70ed
|
minor fix
|
2015-09-10 16:20:14 +02:00 |
|
Tim Daubenschütz
|
82b9b68338
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-09-10 16:14:02 +02:00 |
|
TimDaubenschuetz
|
98bab24905
|
Merged in AD-931-allow-to-reset-form-after-submit (pull request #55)
Ad 931 allow to reset form after submit
|
2015-09-10 16:11:52 +02:00 |
|
Tim Daubenschütz
|
12e7c2c898
|
add download button to contract list
|
2015-09-10 15:47:27 +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
|
ecb51ca5e7
|
added appendix
|
2015-09-09 14:15:00 +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
|
a87879dd3d
|
contractSerializer with readonly for update
|
2015-09-08 15:06:19 +02:00 |
|
diminator
|
2a92b38a9a
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-08 14:43:38 +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
|
3e1b362cc0
|
remove debugged 204 no response comes as error, handled gracefully
|
2015-09-08 13:08:49 +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
|
ba2ebe81fd
|
code restructuring
|
2015-09-08 11:44:05 +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 |
|
Tim Daubenschütz
|
38b7dcd79f
|
finalize contract styles
|
2015-09-08 10:15:26 +02:00 |
|
Tim Daubenschütz
|
2c9370e555
|
restyle contract settings list
|
2015-09-08 10:03:20 +02:00 |
|
Cevo
|
86306fc089
|
console.log remove from requests.js
|
2015-09-07 16:36:31 +02:00 |
|
Cevo
|
66cd4a1d7b
|
git ignore removed
|
2015-09-07 16:33:21 +02:00 |
|
Cevo
|
632c04149d
|
tabs inserted in jsx
|
2015-09-07 15:43:44 +02:00 |
|
Cevo
|
6b9bf03941
|
tabs inserted in jsx
|
2015-09-07 15:08:01 +02:00 |
|
Cevo
|
1dba9196e7
|
tabs inserted in jsx
|
2015-09-07 14:30:45 +02:00 |
|
diminator
|
22aa0139ae
|
terms and conditions page with accept/deny
Needed: copyright societies in backend
|
2015-09-07 12:03:59 +02:00 |
|
Cevo
|
501d7ac7c0
|
now committing the remove contract
|
2015-09-07 11:38:23 +02:00 |
|
Cevo
|
ae21686f26
|
slash added to route
|
2015-09-07 10:23:39 +02:00 |
|
diminator
|
1611a75036
|
Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col
Conflicts:
ownership/serializers.py
|
2015-09-04 16:48:00 +02:00 |
|
diminator
|
4bdab3410e
|
contractagreementserializer with contract fully expanded
|
2015-09-04 14:48:10 +02:00 |
|
diminator
|
8a49006592
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-04 11:51:17 +02:00 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +02:00 |
|
Cevo
|
f312c94eeb
|
if there is anything else
|
2015-09-04 11:31:53 +02:00 |
|
Cevo
|
eb4994b05e
|
add more
|
2015-09-03 18:25:12 +02:00 |
|
TimDaubenschuetz
|
2b5339a3c0
|
Merged in AD-914-fix-sentry-logging (pull request #50)
Ad 914 fix sentry logging
|
2015-09-03 18:22:50 +02:00 |
|