1
0
mirror of https://github.com/ascribe/onion.git synced 2025-01-09 05:06:59 +01:00
Commit Graph

52 Commits

Author SHA1 Message Date
Tim Daubenschütz
6301c0fe46 Refactor to route specific footer 2016-03-07 13:45:40 +01:00
Tim Daubenschütz
1c94ecc177 Add footer property to Route 2016-03-04 15:53:55 +01:00
Tim Daubenschütz
dad4ea4e87 Merge pull request #107 from ascribe/cosmetic-fix-for-multiline-destructure
Update multiline destructuring format based on style guide
2016-02-09 09:27:26 +01:00
Brett Sun
0f9e7cd3f6 Fix missing cases of getLangText 2016-02-08 14:50:24 +01:00
Brett Sun
8fce04125f Merge with master 2016-02-08 14:08:54 +01:00
Brett Sun
40894cfea6 Use the 'ascribe-app' class for all apps
Simplifies testing so we can just look for a single class throughout
all the apps when ensuring React has loaded our app
2016-02-05 14:22:42 +01:00
Brett Sun
8ba9eb20b6 Add better PropType validation for components 2016-02-05 11:53:33 +01:00
Brett Sun
1091e76447 Clean up the prize AccordionList and fix merge bug 2016-02-05 10:39:46 +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
aa00415a83 Merge with master 2016-01-18 14:15:19 +01:00
Brett Sun
23ccad9b5f Add changes for PR comments 2016-01-18 13:29:08 +01:00
Brett Sun
621cc76e4a Use template strings to join two strings together instead of join() 2016-01-18 11:37:11 +01:00
Brett Sun
78cf40ba64 Small cosmetic changes 2016-01-18 10:53:01 +01:00
Brett Sun
a2320b892d Merge with master 2016-01-18 10:40:13 +01:00
Brett Sun
7136f2ce6c Add getInitialState and source pattern for PieceStore 2016-01-14 13:20:45 +01:00
Brett Sun
466872affb Move getInitialState() to be the first function after a store's constructor 2016-01-13 17:13:44 +01:00
Brett Sun
315e5f0108 Add .isRequired to App proptypes 2016-01-12 15:05:00 +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
d4064ee83a Change Header and parents for loading UserStore from top level app 2016-01-11 18:41:07 +01:00
Brett Sun
58f57af932 Remove unused props in LoginForm 2016-01-11 18:07:52 +01:00
Brett Sun
443be236f5 Whitespace fix for comments 2016-01-11 16:26:36 +01:00
Brett Sun
06ea23c627 Update prize routes for loading user and whitelabel settings in top level app 2016-01-11 15:14:54 +01:00
Brett Sun
8dfa257317 Merge pull request #96 from ascribe/AD-1503-email-link-param-prefills-not-working
AD-1503 Email links do not prefill fields
2016-01-11 11:29:16 +01:00
Brett Sun
e76a36621e Use correct prize_round parameter 2016-01-05 19:45:49 +01:00
Brett Sun
4624e936b3 Use the new history api and its LocationDescriptors 2016-01-05 17:27:25 +01:00
Brett Sun
0ce1633294 Add round parameter to prize ratings 2016-01-04 19:40:54 +01:00
Brett Sun
13937c9951 Fix stale prize ratings showing up on other pieces when they do not have ratings 2015-12-23 20:43:46 +01:00
Brett Sun
39730ec637 Merge with master 2015-12-23 13:17:08 +01:00
Brett Sun
1cf8ca006a Move loan request action at the end of a prize to be sluice specific 2015-12-21 16:16:41 +01:00
Brett Sun
8ff747e117 Componentize the action available for selected prizes 2015-12-18 14:57:52 +01:00
Brett Sun
089c4ad009 Small fixes and destructuring 2015-12-17 18:47:47 +01:00
Brett Sun
1808d38c70 Merge PrizePieceContainer from #76 2015-12-17 17:39:30 +01:00
Brett Sun
c7f272c3a3 Small fixes for DRY and React warnings 2015-12-17 17:31:33 +01:00
Brett Sun
0f8094ef55 Merge pull request #69 from ascribe/AD-1346-hide-piece-registration-if-cant-submit
AD-1346 Hide piece registration if user cannot submit to whitelabel
2015-12-17 16:44:25 +01:00
Brett Sun
08025cc427 Remove unused showAddWork property from Header 2015-12-14 18:58:05 +01:00
Brett Sun
d0cef8c836 Add additional data fields requested by PR
Also adds way to sort the Properties in Prize Details by appending
`[digit]-[label]` to the Property’s name.
2015-12-14 13:03:19 +01:00
Brett Sun
3286ef77bf Add 404 handling to prizes' piece container 2015-12-14 11:57:14 +01:00
diminator
51ff0295c0 refactor prize app to be compliant with whitelabel settings 2015-12-10 14:07:05 +01:00
Tim Daubenschütz
32bc4b0c69 Add custom styling for PR 2015-12-08 16:43:45 +01:00
Brett Sun
cfae0f67c0 Fix unnecessary promise chain in PrizePieceRatings 2015-12-08 15:09:33 +01:00
Brett Sun
257ff9b5d3 Destructure params for fetchPieceList 2015-12-08 15:09:03 +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
bde1e454ed Change loan form's startdate and enddate props to be camel case 2015-12-03 13:34:00 +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
8188e5ca2f Merge branch 'master' into AD-1315-implement-submission-flow 2015-11-16 09:41:06 +01:00
Tim Daubenschütz
0438f461c2 Implement static feedback for submitted pieces 2015-11-11 16:27:50 +01:00
Tim Daubenschütz
7721d62319 Create boilerplate code for portfolioreview 2015-11-06 16:52:08 +01:00