ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
Code Issues Releases Wiki Activity
2,461 Commits 115 Branches 0 Tags 13 MiB
3be515402c
Commit Graph

136 Commits

Author SHA1 Message Date
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
2ad2ea242d Changes for PR comments 2016-01-18 17:31:56 +01:00
Brett Sun
b22ae7def1 Small bug fixes for components affected by the UserStore and WhitelabelStore being passed down as a prop 2016-01-12 15:07:38 +01:00
Brett Sun
8009174787 Change AccordionListItems and parents for loading UserStore from top level app 2016-01-11 19:06:50 +01:00
Brett Sun
1c4ca0d152 Change RegisterPieceForm and parents for loading UserStore from top level app 2016-01-11 18:16:46 +01:00
Brett Sun
8531b77633 Merge with master 2016-01-11 17:52:32 +01:00
Brett Sun
194c554637 Update Ikono routes for loading user and whitelabel settings in top level app 2016-01-11 16:56:24 +01:00
Brett Sun
cf6d653c68 Small code style fixes 2015-12-23 09:33:25 +01:00
Brett Sun
6cc9ce8094 Don't redirect to register piece and then to contract notifications 
Avoids new user getting asked if they want to cancel registration of a
piece before they even agree to the Ikono contract.
 2015-12-14 18:34:27 +01:00
Tim Daubenschütz
aba0747fe3 Merge pull request #30 from ascribe/AD-1313-Attach-thumbnail-to-piece-in-register-form 
Ad 1313 attach thumbnail to piece in register form
 2015-12-07 17:17:19 +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
49421e1fa1 Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 
Conflicts:
	js/components/ascribe_detail/further_details_fileuploader.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_forms/property.js
	js/components/ascribe_forms/property_collapsible.js
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
	sass/ascribe-fonts/ascribe-fonts.scss
	sass/whitelabel/wallet/cyland/cyland_custom_style.scss
 2015-12-07 13:39:30 +01:00
Brett Sun
c1959033c0 Fix comments in PR 2015-12-04 16:34:25 +01:00
Tim Daubenschütz
34126c2254 Fix negation of expanded prop of Property 2015-12-04 10:49:41 +01:00
Tim Daubenschütz
5a05a029b7 Merge branch 'AD-1149-additional-details' of github.com:ascribe/onion into AD-1149-additional-details 2015-12-03 21:30:48 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f9694254c75f0cff46222d895d97dd791: 
- Integrate PropertyCollapsible's functionality to Property
 2015-12-03 20:26:53 +01:00
Brett Sun
854b642de8 Merge with main AD-1149 branch 2015-12-03 17:48:33 +01:00
Brett Sun
bde1e454ed Change loan form's startdate and enddate props to be camel case 2015-12-03 13:34:00 +01:00
diminator
565bf308ae tested and fixed ikonotv 2015-12-02 21:42:35 +01:00
Tim Daubenschütz
fe24a5e15a Remove all occurrences of inactivity mgmt of ReactS3Fineuploader 2015-12-02 12:37:21 +01:00
Tim Daubenschütz
88d1edd45c Add pageExitWarning for SlidesContainer 2015-11-25 15:01:23 +01:00
Tim Daubenschütz
943d62dd8c Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark 2015-11-20 17:59:26 +01:00
Tim Daubenschütz
1ac2fe7f96 Remove all occurences of 'hidden' prop usage for Property 2015-11-17 15:52:40 +01:00
Tim Daubenschütz
c852eaf143 Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014 
Replace Javascript's Date object with momentjs
 2015-11-13 09:58:12 +01:00
Brett Sun
543605aae3 Move store resets to componentDidMount() 2015-11-04 13:56:43 +01:00
Tim Daubenschütz
c6f6bb398d Replace all occurrences of with momentjs 2015-11-03 10:57:41 +01:00
Tim Daubenschütz
147c852b02 Replace getFullYear() with getUTCFullYear() 2015-11-02 10:32:48 +01:00
Tim Daubenschütz
42733740db Fix correct year extraction from date-string in 
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
 2015-10-26 16:07:31 +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
diminator
317d2611ba spinners part2 
scrollbar

uploader styles

property blur
 2015-10-14 16:17:10 +02:00
vrde
21c84774c8 Add document title for wallets 2015-10-13 17:29:53 +02:00
Tim Daubenschütz
2121c6af3d Rename whitelabel component director to ikonotv specific prefix 2015-10-13 11:39:33 +02:00
diminator
8d970a65c4 spinners in forms 
button wide
 2015-10-12 17:55:02 +02:00
Tim Daubenschütz
d760fe13d0 Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
 2015-10-12 14:18:53 +02:00
Tim Daubenschütz
f38ce126b7 Correct handleSuccess of AclButtonList 2015-10-12 10:37:08 +02:00
Tim Daubenschütz
b95906d83e Fix whitelabel styling 2015-10-01 16:11:29 +02:00
Tim Daubenschütz
9a17e44df1 Refactor of wallet app routing 2015-10-01 15:57:46 +02:00
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
17fd470e6b Upgrade react-router-bootstrap 2015-10-01 14:00:56 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +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
2dda22d848 fix: ikonotv redirect to collection if logged in 2015-09-28 16:57:46 +02:00
diminator
19f94110b7 fix: ikonotv redirect to collection if logged in 2015-09-28 16:57:35 +02:00
diminator
e6a6c2c2a3 set collapsible default show=true 2015-09-25 15:33:01 +02:00