Tim Daubenschütz
|
2e6acff56d
|
Make user email uneditable
|
2015-09-28 10:02:07 +02:00 |
|
diminator
|
b2cbe2c674
|
merged
|
2015-09-25 15:35:36 +02:00 |
|
diminator
|
e6a6c2c2a3
|
set collapsible default show=true
|
2015-09-25 15:33:01 +02:00 |
|
Tim Daubenschütz
|
cb452ce7bf
|
PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex
|
2015-09-25 15:22:16 +02:00 |
|
Tim Daubenschütz
|
9080c84fa9
|
Implement word wrap for ContractSettings
|
2015-09-25 11:20:12 +02:00 |
|
Tim Daubenschütz
|
a6f09c8f35
|
add acl for update button in ContractSettings
|
2015-09-23 16:09:12 +02:00 |
|
Tim Daubenschütz
|
74e7c9a3d9
|
Integrate new ACLOptions into settings
|
2015-09-23 15:41:12 +02:00 |
|
Tim Daubenschütz
|
2a4bc2af89
|
separate contract settings from account settings
|
2015-09-23 15:16:46 +02:00 |
|
Tim Daubenschütz
|
90d6ec20f6
|
Revert "Revert "acls on 3 levels""
This reverts commit c02d1ea3ac .
|
2015-09-22 17:38:25 +02:00 |
|
Tim Daubenschütz
|
c02d1ea3ac
|
Revert "acls on 3 levels"
This reverts commit f1bc400faf .
|
2015-09-22 17:29:07 +02:00 |
|
diminator
|
f1bc400faf
|
acls on 3 levels
whitelabel
user
piece
the higher on the list, the more power (whitelabel overrides user and piece)
|
2015-09-22 17:23:19 +02:00 |
|
Tim Daubenschütz
|
0819724a10
|
probably fix dispatch.dispatch error + showing wrong piece data bug
|
2015-09-21 10:57:10 +02:00 |
|
diminator
|
9d67d046d0
|
fix currentUser bug
|
2015-09-21 10:32:35 +02:00 |
|
diminator
|
9bfd50e3bc
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
Conflicts:
js/components/signup_container.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
|
2015-09-21 10:21:44 +02:00 |
|
Tim Daubenschütz
|
afef1214f0
|
contract expandedDefault to false
|
2015-09-18 16:04:48 +02:00 |
|
Tim Daubenschütz
|
eb43b18167
|
make remove in ContractSettings a secondary action
|
2015-09-18 15:22:57 +02:00 |
|
Tim Daubenschütz
|
63b375ade6
|
fix separation
|
2015-09-18 15:17:24 +02:00 |
|
diminator
|
7bccb26d82
|
acl on contract settings
|
2015-09-18 09:46:37 +02:00 |
|
diminator
|
b24d4608dd
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
|
2015-09-16 15:59:07 +02:00 |
|
Tim Daubenschütz
|
7c376b7229
|
PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants
|
2015-09-16 15:14:08 +02:00 |
|
Tim Daubenschütz
|
b2a3c9545b
|
minor corrections
|
2015-09-16 14:07:55 +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 |
|
Tim Daubenschütz
|
17cb2223c2
|
finalize contract update button
|
2015-09-16 09:47:22 +02:00 |
|
Tim Daubenschütz
|
f0936b9074
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
|
2015-09-15 17:19:50 +02:00 |
|
Tim Daubenschütz
|
2656bdac14
|
correct query parameters for contract list request
|
2015-09-15 17:18:38 +02:00 |
|
Tim Daubenschütz
|
83b20e6472
|
First cut: Upload button for contract settings
|
2015-09-15 16:35:45 +02:00 |
|
Tim Daubenschütz
|
497a330e1a
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
|
2015-09-15 13:56:31 +02:00 |
|
Tim Daubenschütz
|
c5ef3cacd5
|
add ContractSettingsUpdateButton boilerplate code
|
2015-09-15 11:50:23 +02:00 |
|
Tim Daubenschütz
|
24f0d84fbc
|
finalize contract settings layout
|
2015-09-14 17:38:26 +02:00 |
|
Tim Daubenschütz
|
209d141939
|
extend fileClassToUpload functionality and implement it in contract settings
|
2015-09-14 17:02:47 +02:00 |
|
diminator
|
7fd5516b79
|
contract, contractagreement migration
contractagreement added to loanpiece
|
2015-09-14 14:16:53 +02:00 |
|
Tim Daubenschütz
|
12e7c2c898
|
add download button to contract list
|
2015-09-10 15:47:27 +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 |
|
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 |
|
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
|
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 |
|
Cevo
|
501d7ac7c0
|
now committing the remove contract
|
2015-09-07 11:38:23 +02:00 |
|
Cevo
|
eb4994b05e
|
add more
|
2015-09-03 18:25:12 +02:00 |
|
Cevo
|
57c4076c1e
|
pushing the contract u[pdate on client side
|
2015-09-03 17:19:29 +02:00 |
|
Cevo
|
d2f8b658af
|
contract listing being done
|
2015-09-03 15:53:02 +02:00 |
|
Cevo
|
aa3c188509
|
contract list add
|
2015-09-02 14:02:23 +02:00 |
|
Tim Daubenschütz
|
b4abe7a245
|
generic form submission determination for fineuploader
|
2015-09-01 14:42:09 +02:00 |
|
Tim Daubenschütz
|
b5b1e36109
|
nested collapsible paragraphs
|
2015-09-01 14:00:06 +02:00 |
|
Tim Daubenschütz
|
96fdb598f7
|
change api endpoints to contractblobs
|
2015-08-31 17:29:43 +02:00 |
|