ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,242 Commits 115 Branches 0 Tags 13 MiB
ef22707680
Commit Graph

983 Commits

Author SHA1 Message Date
diminator
ef22707680 create public agreement 2015-09-11 18:23:31 +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
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
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
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
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
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
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
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
eb4994b05e add more 2015-09-03 18:25:12 +02:00
Tim Daubenschütz
ac28ef4ee0 remove raven 2015-09-04 18:15:42 +02:00
Tim Daubenschütz
4374235c1b use log global again 2015-09-03 17:55:15 +02:00
Tim Daubenschütz
3b61ac5c6a remove mangle and fix bug in react-fineuploader 2015-09-04 17:31:58 +02:00
Tim Daubenschütz
ec1def31fb Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' into AD-914-fix-sentry-logging 2015-09-04 17:16:54 +02:00
Tim Daubenschütz
7dae23a265 remove fastly 2015-09-04 17:05:17 +02:00
Tim Daubenschütz
bc0ac05d2d Merge branch 'master' of bitbucket.org:ascribe/onion 2015-09-04 16:25:47 +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
Cevo
57c4076c1e pushing the contract u[pdate on client side 2015-09-03 17:19:29 +02:00