ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
1,664 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

65 Commits

Author SHA1 Message Date
Brett Sun d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Tim Daubenschütz f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
 2015-10-19 10:30:14 +02:00
Tim Daubenschütz 712ec74247 add getLangText 2015-10-16 12:10:28 +02:00
Tim Daubenschütz 32d317cdef add download button to loan form 2015-10-16 11:29:08 +02:00
diminator 317d2611ba spinners part2 
scrollbar

uploader styles

property blur
 2015-10-14 16:17:10 +02:00
diminator 8d970a65c4 spinners in forms 
button wide
 2015-10-12 17:55:02 +02:00
diminator aaa1a9a000 replaced fonts 
replaced spinners WIP

renamed settings-property to property
 2015-10-12 15:25:21 +02:00
Tim Daubenschütz 5b9d7eae65 Corrections on loan form 2015-09-28 15:14:45 +02:00
Tim Daubenschütz 1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
Tim Daubenschütz 6102ed3bb4 update react textarea autosize 2015-09-21 16:10:25 +02:00
Tim Daubenschütz c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
diminator ec0208358d added appendix 2015-09-21 10:54:13 +02:00
Tim Daubenschütz 2cbf7d0095 Implement PR Feedback 2015-09-18 14:12:50 +02:00
Tim Daubenschütz 780ab9f7f1 Cleanup window.setTimeout 2015-09-17 13:28:59 +02:00
diminator 63fffc2132 PR comments fix 2015-09-17 11:39:55 +02:00
diminator 5c2ec3ffb0 bug fix signup query 
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
 2015-09-16 23:27:38 +02:00
diminator d6bd4b4ac1 bug fix acl button 
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
 2015-09-16 14:07:13 +02:00
diminator 06f5b61cad reset agreements on mount of loan_form 2015-09-15 13:37:18 +02:00
diminator 71f94768d9 fix PR comments 2015-09-15 13:22:52 +02:00
diminator 0ce298879b fixed tests 
refactored contractagreement actions
 2015-09-14 17:53:50 +02:00
diminator 7fd5516b79 contract, contractagreement migration 
contractagreement added to loanpiece
 2015-09-14 14:16:53 +02:00
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 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 5588f766c1 add reset functionality for InputDate and LoanForm 2015-09-10 13:24:32 +02:00
Tim Daubenschütz dd20afff90 rename LoanContract to Contract 2015-08-28 16:18:10 +02:00
Tim Daubenschütz 9a9aa68ca9 fix lazy evalutaion of loan form 2015-08-28 11:13:28 +02:00
diminator 79106dd106 loan request + answer complete 2015-08-27 11:38:21 +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 b2fed6426f loan request up till accept 2015-08-26 09:50:38 +02:00
Tim Daubenschütz 5acce27df2 Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-21 11:35:00 +02:00
Tim Daubenschütz e0b2f352df fix locked fields 2015-08-21 11:29:57 +02:00
Tim Daubenschütz 30d57a943f fix lock form 2015-08-21 11:01:13 +02:00
diminator 433703a470 moved terms 2015-08-21 10:54:57 +02:00
Tim Daubenschütz 5d4762f942 fix lock functionality bug 2015-08-20 11:03:00 +02:00
Tim Daubenschütz 0cf5815f42 add functionality to make a forwarded process slide container 2015-08-12 16:11:15 +02:00
Tim Daubenschütz d3bf990ca5 adjust props 2015-08-12 14:40:44 +02:00
Tim Daubenschütz 1620437c86 add defaultValue to inputdate 2015-08-12 13:53:17 +02:00
Tim Daubenschütz d5dc164810 boilerplate for loan process 2015-08-12 13:34:41 +02:00
Tim Daubenschütz 8f9c699b69 Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r 
Conflicts:
	js/components/ascribe_buttons/submit_to_prize_button.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
 2015-08-07 14:10:05 +02:00
Tim Daubenschütz dfbc7b75fe fix loan form 2015-08-06 15:14:50 +02:00
Tim Daubenschütz 1ae77d5157 remove close button from modals 2015-08-05 18:00:44 +02:00
Tim Daubenschütz 4c88f88d56 first cut porting and using new react-bootstrap version 2015-08-05 17:32:35 +02:00
Tim Daubenschütz b0d3213816 add flushLoanContract logic 2015-07-29 15:03:15 +02:00
Tim Daubenschütz 8da71d0229 make term components unique in loan form 2015-07-29 14:46:33 +02:00
Tim Daubenschütz bb11bbc6e4 Fix all instances of input checkbox 2015-07-28 15:33:47 +02:00
diminator 2cece3ce33 inputcheckbox defaultvalue WIP 2015-07-28 11:32:16 +02:00
Tim Daubenschütz c2ce0b9d05 load fix 2015-07-15 17:57:28 +02:00