1367 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tim Daubenschütz	6c713714ec	make contract creation implicit	2015-09-14 16:15:01 +02:00
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
diminator	7fd5516b79	contract, contractagreement migration ... contractagreement added to loanpiece	2015-09-14 14:16:53 +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	f42f4a02f8	Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading ... Resolve merge conflicts with master for easier PR. Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js	2015-09-14 11:14:02 +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
diminator	ef22707680	create public agreement	2015-09-11 18:23:31 +02:00
Tim Daubenschütz	c8ece4c532	refactor contract creation form	2015-09-11 10:11:07 +02:00
diminator	23eb3a7fd9	Fetch contractagreements, order them and filter by accepted or pending ... Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan- Conflicts: ownership/serializers.py	2015-09-10 20:20:42 +02:00
diminator	b45c68b2dc	Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan- ... Conflicts: ownership/serializers.py	2015-09-10 18:54:25 +02:00
diminator	1106cebf98	Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-885-convert-roles-to-acls	2015-09-10 18:10:06 +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
Tim Daubenschütz	b4756be60a	replace anonymous filter functions with util functions	2015-09-10 09:54:02 +02:00
Tim Daubenschütz	1fabea93ff	refactor file size calculation	2015-09-10 09:30:04 +02:00
diminator	1c5b0c7172	only one agreement pending ... agreement notifications per subdomain (only by whitelabel owner)	2015-09-09 19:29:58 +02:00
Tim Daubenschütz	3307e282e4	remove header title	2015-09-09 17:27:23 +02:00
Tim Daubenschütz	2ba27d3847	add documentation for exception	2015-09-09 17:21:55 +02:00
Tim Daubenschütz	384e0e3e6f	only show progress bar if files are greater than 10MB	2015-09-09 16:32:08 +02:00
Tim Daubenschütz	2cc4284118	minor cleanup	2015-09-09 16:22:20 +02:00
Tim Daubenschütz	8255c8dc6f	style progress bar	2015-09-09 15:15:54 +02:00
diminator	ecb51ca5e7	added appendix	2015-09-09 14:15:00 +02:00
Tim Daubenschütz	801227cfee	remove react-progress-bar for react-bootstrap progressbar	2015-09-09 14:11:52 +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
Tim Daubenschütz	f850176b7c	add documentation for nav routes links	2015-09-08 14:26:56 +02:00
Tim Daubenschütz	cb6c4aaf0e	integrate acl into navrouteslist + little refactor on those components	2015-09-08 14:20:06 +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
diminator	9409af4e1e	acls on user level for ikonotv	2015-09-08 11:35:34 +02:00
Tim Daubenschütz	2c1ad6dc46	fix bug in contract settings and expand actionpanel functionality	2015-09-08 11:19:11 +02:00