Tim Daubenschütz
a8c436c40b
Change detail text in loan process
2015-09-22 11:56:30 +02:00
Tim Daubenschütz
aaa27550af
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
2015-09-22 11:43:53 +02:00
Tim Daubenschütz
a0ff5af62b
Make style changes
2015-09-22 11:33:59 +02:00
Tim Daubenschütz
b0b44718da
Changes to landing page text according to Elisabeth
2015-09-22 10:29:23 +02:00
diminator
b4c7b864fd
check if piece exists in props in wallet details
2015-09-22 09:20:10 +02:00
diminator
904793269b
refactored detail page for wallets
2015-09-21 18:04:15 +02:00
diminator
c837890895
Merge remote-tracking branch 'remotes/origin/AD-1029-add-filter-for-submitted-accepte' into AD-943-add-custom-additional-fields
2015-09-21 16:51:28 +02:00
diminator
a4fe0417c3
refactored and adapted for cyland
2015-09-21 16:47:29 +02:00
Tim Daubenschütz
bd99adf4c9
add componentWillReceiveProps in ikono piece detail again
2015-09-21 16:25:28 +02:00
diminator
fdbae0316f
filter for submitted and accepted on ikonotv
...
MIGRATE AND
./manage.py loaddata whitelabel/fixtures/settings.json
2015-09-21 16:14:39 +02:00
Tim Daubenschütz
6102ed3bb4
update react textarea autosize
2015-09-21 16:10:25 +02:00
Tim Daubenschütz
04e331f4e5
hide additional files when not defined and already loaned to whitelabel customer
2015-09-21 15:57:27 +02:00
Tim Daubenschütz
6c2bb041f9
finalize whitelabel custom fields
2015-09-21 15:46:24 +02:00
Tim Daubenschütz
c756024702
Add whitelabel tailored extra_data forms to piece detail
2015-09-21 15:08:24 +02:00
Tim Daubenschütz
652df66cb3
Fix some issues with smelly code
2015-09-21 14:22:52 +02:00
Tim Daubenschütz
8a6674509c
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
2015-09-21 12:05:53 +02:00
Tim Daubenschütz
c00e003aeb
refactor input textarea to use disabled instead of editable
2015-09-21 12:05:42 +02:00
diminator
92f543490e
buttonlink style
2015-09-21 11:26:36 +02:00
diminator
a8976ca54a
Merge remote-tracking branch 'remotes/origin/AD-996-add-action-buttons-to-piece-detai' into AD-943-add-custom-additional-fields
2015-09-21 11:08:05 +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
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
7482c3f448
add user endpoint to cyland
2015-09-18 15:51:15 +02:00
vrde
7be3c8b469
Add style for signup and login
2015-09-18 15:36:01 +02:00
TimDaubenschuetz
26321571cb
Merged in AD-984-disable-contracts-for-regular-asc (pull request #64 )
...
acl on contract settings
2015-09-18 15:20:08 +02:00
TimDaubenschuetz
4f55c63cf5
Merged in AD-997-prepare-landing-page (pull request #67 )
...
Finish styling for landing page
2015-09-18 14:54:11 +02:00
vrde
03803ca61a
Add active routes as css classes
2015-09-18 14:25:31 +02:00
Tim Daubenschütz
2cbf7d0095
Implement PR Feedback
2015-09-18 14:12:50 +02:00
vrde
b76ffcde73
Finish styling for landing page
2015-09-18 13:46:15 +02:00
diminator
c67c87f17b
WARNING: Based upon D-943, which hasnt been approved/merged yet
...
after AD-943 has been approved, merge it in this branch and do PR
actions + buttons in ikono piece detail
2015-09-18 10:11:35 +02:00
diminator
6146a5f6f4
Merge remote-tracking branch 'remotes/origin/AD-943-add-custom-additional-fields' into AD-996-add-action-buttons-to-piece-detai
2015-09-18 09:55:07 +02:00
diminator
7bccb26d82
acl on contract settings
2015-09-18 09:46:37 +02:00
diminator
ff163df61e
PR update
2015-09-17 14:20:46 +02:00
diminator
63fffc2132
PR comments fix
2015-09-17 11:39:55 +02:00
Tim Daubenschütz
67e0b34640
integrate filtering into IkonoTv and Cyland whitelabel
2015-09-17 10:06:47 +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
08405dd310
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-16 20:46:52 +02:00
diminator
a85447e94c
bug fix user token on signup/login
2015-09-16 19:00:59 +02:00
Tim Daubenschütz
a36cc9d782
minor correction
2015-09-16 18:32:34 +02:00
Tim Daubenschütz
5c49fd6f14
implement ikonotv landing page according to mockups
2015-09-16 18:31:46 +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
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
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
diminator
430ac59f7b
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-15 13:56:11 +02:00
Tim Daubenschütz
891b2eee9e
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-15 13:53:29 +02:00
Cevo
6a57a69e29
main.scss edited
2015-09-15 13:53:09 +02:00
diminator
d4799318a8
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-15 13:49:18 +02:00
Tim Daubenschütz
fbbbd1de89
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
...
Fix merge conflicts
Conflicts:
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +02:00
diminator
4ae137ee9e
Merged in AD-924-apply-contractagreements-to-loan- (pull request #57 )
...
Ad 924 apply contractagreements to loan
2015-09-15 13:43:21 +02:00
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
diminator
b29bf38f13
ikono slides
2015-09-15 13:15:29 +02:00
