Brett Sun
|
8ba9eb20b6
|
Add better PropType validation for components
|
2016-02-05 11:53:33 +01:00 |
|
Brett Sun
|
826ca08073
|
Merge with master
|
2016-02-05 10:38:59 +01:00 |
|
Brett Sun
|
8531b77633
|
Merge with master
|
2016-01-11 17:52:32 +01:00 |
|
Brett Sun
|
3e66b78d4c
|
Update Cyland routes for loading user and whitelabel settings in top level app
|
2016-01-11 16:27:03 +01:00 |
|
Brett Sun
|
fd9ec413f2
|
Forgot to include white label piece containers in previous fix
|
2015-12-07 15:14:01 +01:00 |
|
Tim Daubenschütz
|
da73d40fd6
|
Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
Cleared all conflicts
Conflicts:
js/components/ascribe_forms/form.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/utils/requests.js
|
2015-11-16 15:27:00 +01:00 |
|
Brett Sun
|
543605aae3
|
Move store resets to componentDidMount()
|
2015-11-04 13:56:43 +01:00 |
|
Brett Sun
|
a513af984d
|
Update cyland for FineUploader changes
|
2015-11-02 10:41:59 +01:00 |
|
Tim Daubenschütz
|
7f97ce9828
|
Handle deletion method for WalletPieceContainer
|
2015-10-21 23:45:53 +02:00 |
|
Tim Daubenschütz
|
fad6caca63
|
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
|
2015-10-21 09:47:14 +02:00 |
|
vrde
|
e220ee6fbb
|
Merge branch 'AD-697-update-title-in-the-browser'
|
2015-10-20 15:06: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
|
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 |
|
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 |
|
Tim Daubenschütz
|
e4c7f9e071
|
Rename whitelabel component director to cyland specific prefix
|
2015-10-13 11:23:21 +02:00 |
|