tim
|
751f3e3572
|
Revert "Added default admin bokk email in forms."
This reverts commit f190009850 .
|
2016-11-07 14:38:03 +01:00 |
|
Oscar Rezo
|
f190009850
|
Added default admin bokk email in forms.
|
2016-11-03 18:35:14 +01:00 |
|
Brett Sun
|
8fce04125f
|
Merge with master
|
2016-02-08 14:08:54 +01:00 |
|
Brett Sun
|
37608004e3
|
Merge pull request #78 from ascribe/AD-1521-refactor-property-padding
Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
|
2016-02-04 15:15:01 +01:00 |
|
Brett Sun
|
e5cae3fc34
|
Update multiline destructuring format based on style guide
|
2016-01-18 14:46:39 +01:00 |
|
Brett Sun
|
614bc3f74b
|
Small form fixes
|
2015-12-18 15:00:52 +01:00 |
|
Brett Sun
|
bf244e2bfa
|
Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
Avoids having to style all the collapsible Properties with
`padding-bottom: 0` to center labels when collapsed.
|
2015-12-16 19:03:01 +01:00 |
|
Brett Sun
|
f4227e9906
|
Update form's email state if the email prop changes
|
2015-12-16 15:17:47 +01:00 |
|
Brett Sun
|
1ea89313ff
|
Add custom buttons to loan form for Cyland registration
|
2015-12-16 12:43:03 +01:00 |
|
Brett Sun
|
c1959033c0
|
Fix comments in PR
|
2015-12-04 16:34:25 +01:00 |
|
Brett Sun
|
4b17225783
|
Fix padding in InputContractAgreementCheckbox
|
2015-12-04 13:32:29 +01:00 |
|
Tim Daubenschütz
|
36041d3b51
|
Refactor ContractAgreementProperty to InputContractAgreementCheckbox. Thx to @Brett
|
2015-12-03 21:30:05 +01:00 |
|
Tim Daubenschütz
|
8ec0634d2e
|
Cherry-pick from 1ac2fe7f96 :
- Integrate PropertyCollapsible's functionality to Property
|
2015-12-03 20:26:53 +01:00 |
|
Brett Sun
|
f5a527b251
|
Fix references to form due to nested property elements
|
2015-12-03 17:19:17 +01:00 |
|
Brett Sun
|
3c516c1598
|
Refactor contract agreement to be a self contained component that can be used in forms
|
2015-12-03 15:22:17 +01:00 |
|
Brett Sun
|
e442e6bcec
|
Make email input be react controlled in loan and consign forms
|
2015-12-03 15:21:14 +01:00 |
|
Brett Sun
|
bde1e454ed
|
Change loan form's startdate and enddate props to be camel case
|
2015-12-03 13:34:00 +01:00 |
|
Brett Sun
|
864e0bd2a6
|
Remove redundant truth check for required prop
|
2015-10-29 15:45:00 +01:00 |
|
Brett Sun
|
906ef7c37e
|
Refactor InputTextAreaToggable's required property to take a bool instead
|
2015-10-28 19:19:14 +01:00 |
|
Tim Daubenschütz
|
cd3c8b8f6e
|
Complete visual styling
|
2015-10-23 10:37:23 +02:00 |
|
Tim Daubenschütz
|
d4de2434ee
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
js/components/ascribe_forms/form_share_email.js
js/components/ascribe_forms/form_transfer.js
js/utils/general_utils.js
sass/main.scss
|
2015-10-22 13:38:49 +02:00 |
|
Tim Daubenschütz
|
8d0e9a42fc
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
package.json
|
2015-10-20 18:11:41 +02: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 |
|
Tim Daubenschütz
|
d77bdb25a5
|
Cleanup code
|
2015-10-15 11:17:16 +02:00 |
|
diminator
|
317d2611ba
|
spinners part2
scrollbar
uploader styles
property blur
|
2015-10-14 16:17:10 +02:00 |
|
Cevo
|
b4b05b3161
|
information added to forms and delete form title changed, acl information component created, information text is added to the constants
|
2015-10-13 18:33:08 +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 |
|