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
|
3d75a9523c
|
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
|
2015-09-21 15:23:22 +02:00 |
|
Tim Daubenschütz
|
c756024702
|
Add whitelabel tailored extra_data forms to piece detail
|
2015-09-21 15:08:24 +02:00 |
|
Alberto Granzotto
|
887fc99edc
|
Merged in AD-1001-style-header (pull request #70)
Ad 1001 style header
|
2015-09-21 15:06:37 +02:00 |
|
vrde
|
d0c46d4ca2
|
Fix hover/focus status on hambuger icon
|
2015-09-21 14:58:07 +02:00 |
|
vrde
|
9444cfb1bf
|
Add styles for header
|
2015-09-21 14:53:58 +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
|
3cbcfc17a3
|
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
|
2015-09-21 10:57: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
|
ec0208358d
|
added appendix
|
2015-09-21 10:54:13 +02:00 |
|
diminator
|
2486158c12
|
.required => .isRequired
|
2015-09-21 10:47:24 +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
|
7b7250db24
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-18 16:21:03 +02:00 |
|
TimDaubenschuetz
|
c247379065
|
Merged in AD-999-style-login-and-signup-forms (pull request #69)
Ad 999 style login and signup forms
|
2015-09-18 16:20:56 +02:00 |
|
Tim Daubenschütz
|
afef1214f0
|
contract expandedDefault to false
|
2015-09-18 16:04:48 +02:00 |
|
vrde
|
dd965653d6
|
Add style to loading button
|
2015-09-18 16:00:39 +02:00 |
|
Tim Daubenschütz
|
7482c3f448
|
add user endpoint to cyland
|
2015-09-18 15:51:15 +02:00 |
|
vrde
|
94568934ea
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-999-style-login-and-signup-forms
|
2015-09-18 15:43:44 +02:00 |
|
vrde
|
004aa16b3f
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-18 15:43:30 +02:00 |
|
TimDaubenschuetz
|
23b03e1b84
|
Merged in AD-1000-add-already-a-user-link (pull request #68)
Add "already a user" link from signup to login
|
2015-09-18 15:42:32 +02:00 |
|
vrde
|
2ba7eac191
|
Add "already a user" link from signup to login
|
2015-09-18 15:40:06 +02:00 |
|
vrde
|
7be3c8b469
|
Add style for signup and login
|
2015-09-18 15:36:01 +02:00 |
|
Tim Daubenschütz
|
eb43b18167
|
make remove in ContractSettings a secondary action
|
2015-09-18 15:22:57 +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 |
|
Tim Daubenschütz
|
63b375ade6
|
fix separation
|
2015-09-18 15:17:24 +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 |
|
Tim Daubenschütz
|
e05249eacb
|
WIP fix wrong input fields bug
|
2015-09-18 14:50:08 +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
|
c99c3492fb
|
Add margin top to ascribe-wallet-app class
|
2015-09-18 14:02:31 +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 |
|
TimDaubenschuetz
|
05fe507a3f
|
Merged in AD-894-group-collection-by-status (pull request #61)
Ad 894 group collection by status
|
2015-09-18 09:17:14 +02:00 |
|
diminator
|
2bd148407b
|
Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields
|
2015-09-17 14:22:19 +02:00 |
|
diminator
|
ff163df61e
|
PR update
|
2015-09-17 14:20:46 +02:00 |
|
Tim Daubenschütz
|
297d30f21f
|
PR Feeback: Simplify statements
|
2015-09-17 13:52:51 +02:00 |
|
Tim Daubenschütz
|
780ab9f7f1
|
Cleanup window.setTimeout
|
2015-09-17 13:28:59 +02:00 |
|
diminator
|
fa9cfac77d
|
Merged in AD-897-year-created-element-should-start (pull request #63)
min year changed to 1
|
2015-09-17 11:41:49 +02:00 |
|
diminator
|
63fffc2132
|
PR comments fix
|
2015-09-17 11:39:55 +02:00 |
|
Tim Daubenschütz
|
32f38428f1
|
PR Feedback: Fix replacement of underscores in filterParams
|
2015-09-17 11:39:45 +02:00 |
|