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
|
ddc2e7b919
|
Rename intersectAcls to intersectList and do some clean up
|
2015-10-20 18:10:48 +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 |
|
TimDaubenschuetz
|
d66c201a98
|
Merged in AD-727-missing-redirects-to-login-page (pull request #95)
Ad 727 missing redirects to login page
|
2015-10-19 10:13:54 +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
|
ed24ec194e
|
added PR comments
|
2015-10-15 15:24:40 +02:00 |
|
Tim Daubenschütz
|
8bb971d9df
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/cyland/cyland_landing.js
|
2015-10-15 11:55:44 +02:00 |
|
Tim Daubenschütz
|
d77bdb25a5
|
Cleanup code
|
2015-10-15 11:17:16 +02:00 |
|
Tim Daubenschütz
|
a1f159fc2d
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
js/components/ascribe_detail/edition.js
js/utils/general_utils.js
sass/main.scss
|
2015-10-15 10:06:39 +02:00 |
|
diminator
|
c24021302f
|
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_hero.js
|
2015-10-14 17:25:53 +02:00 |
|
diminator
|
317d2611ba
|
spinners part2
scrollbar
uploader styles
property blur
|
2015-10-14 16:17:10 +02:00 |
|
vrde
|
2869cbc125
|
Disable eslint check on specific proptype
|
2015-10-14 15:49:04 +02:00 |
|
vrde
|
01cea9ad3d
|
Property component now propagate its name to its input child
|
2015-10-14 15:30: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
|
6175775503
|
property blur refactor
|
2015-10-12 17:59:45 +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
|
299007baab
|
Refactor redirect and redirectAuthenticated
|
2015-10-09 13:51:21 +02:00 |
|
Tim Daubenschütz
|
f066971ccc
|
Finalize ProxyRoute and RedirectProxyRoute
|
2015-10-06 18:28:15 +02:00 |
|
Tim Daubenschütz
|
28dfcfa75a
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/ascribe_detail/edition.js
js/components/ascribe_forms/form_login.js
js/components/ascribe_forms/form_signup.js
|
2015-10-06 16:40:02 +02:00 |
|
Tim Daubenschütz
|
9a17e44df1
|
Refactor of wallet app routing
|
2015-10-01 15:57:46 +02:00 |
|
diminator
|
5f201ad76a
|
fix redirect
|
2015-10-01 15:38:37 +02:00 |
|
Tim Daubenschütz
|
83c652a4f0
|
Rename pieces routes back to collection
|
2015-10-01 14:30:11 +02:00 |
|
Tim Daubenschütz
|
957d0c66c9
|
minor fixes for last commit
|
2015-10-01 11:24:19 +02:00 |
|
Tim Daubenschütz
|
829f2c592b
|
Switch all usages of Router.Navigation and Router.State
|
2015-10-01 11:16:38 +02:00 |
|
diminator
|
dfa01a0dde
|
signup fix
consign redirect
|
2015-10-01 09:45:12 +02:00 |
|
Tim Daubenschütz
|
8cd4377a58
|
Change links in app to new react-router@1.0rc1 syntax
|
2015-09-30 18:30:50 +02:00 |
|
diminator
|
bbae33a40f
|
avoid dispatcherror when switching to signup
|
2015-09-30 17:07:18 +02:00 |
|
diminator
|
0d6e82a45d
|
WIP signup/login redirect and redirectAuthenticated
|
2015-09-30 17:05:40 +02:00 |
|
Tim Daubenschütz
|
5b9d7eae65
|
Corrections on loan form
|
2015-09-28 15:14:45 +02:00 |
|
Tim Daubenschütz
|
62e85c66ac
|
Rename 'Send loan request' to 'send contract' for ikonoTv
|
2015-09-28 11:51:02 +02:00 |
|
Tim Daubenschütz
|
afef5db150
|
Add proper button to create editions form
|
2015-09-28 10:19:12 +02:00 |
|
diminator
|
5ddf89e020
|
forward to collection after contract sent
|
2015-09-25 15:39:36 +02:00 |
|
Tim Daubenschütz
|
4302da2f81
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-23 14:22:09 +02:00 |
|
Tim Daubenschütz
|
4acbc2c923
|
fix InputTextareaToggable
|
2015-09-23 14:12:33 +02:00 |
|
Tim Daubenschütz
|
3a11efb2fc
|
Improve input_textarea_toggleable
|
2015-09-22 17:13:06 +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
|
33b8e51aee
|
Fix react warning for select inputs
|
2015-09-22 14:13:04 +02:00 |
|
Tim Daubenschütz
|
878a716262
|
Remove 'learn more' from contract form
|
2015-09-22 13:20:55 +02:00 |
|
Tim Daubenschütz
|
31ffc4262a
|
change text in signup form
|
2015-09-22 11:41:10 +02:00 |
|
Tim Daubenschütz
|
6102ed3bb4
|
update react textarea autosize
|
2015-09-21 16:10:25 +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
|
c00e003aeb
|
refactor input textarea to use disabled instead of editable
|
2015-09-21 12:05:42 +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 |
|