ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
2,596 Commits 115 Branches 0 Tags 13 MiB
bokk-styles
Commit Graph

1928 Commits

Author SHA1 Message Date
Brett Sun
a23dd99b94 Merge pull request #98 from ascribe/AD-1417-turn-links-in-further-details-into-anchors 
AD-1417 Turn links in further details into anchors
 2016-01-20 12:41:36 +01:00
Brett Sun
a85c70798e Fix mistaken check for form buttons 2016-01-20 12:32:49 +01:00
Brett Sun
0045dc6981 Add anchorization to whitelabel forms 2016-01-20 12:31:02 +01:00
Brett Sun
d75a2d257d Merge with master 2016-01-19 19:36:30 +01:00
Brett Sun
5b7a5de332 Merge with master 2016-01-19 17:02:04 +01:00
Brett Sun
c6afea2583 Calculate max thumbnail size instead of hard coding it on the registration form 2016-01-19 16:54:08 +01:00
Brett Sun
762af44fbb Merge with master 2016-01-19 16:28:52 +01:00
Brett Sun
2e8d1faaca Remove duplicate onRatingClick missed during merge 2016-01-19 15:59:43 +01:00
Brett Sun
d0d4f773c8 Re-add missed fetch for prize during merge 2016-01-19 15:57:49 +01:00
Brett Sun
f93cd93eff Merge with master 2016-01-19 15:53:51 +01:00
Brett Sun
fbc1a43bf0 Merge with master 2016-01-19 15:28:50 +01:00
Brett Sun
dbdef3ce6b Merge branch 'master' into AD-1452-share-to-facebook-not-loaded 2016-01-19 10:18:52 +01:00
Tim Daubenschütz
3984469f38 Fix input for FacebookShareButton 2016-01-19 09:10:33 +01:00
Brett Sun
58289c4b9c Merge pull request #103 from ascribe/small-cleanup-for-webhook-settings 
Small cleanup for webhook settings
 2016-01-18 18:29:31 +01:00
Brett Sun
2ad2ea242d Changes for PR comments 2016-01-18 17:31:56 +01:00
Brett Sun
e5cae3fc34 Update multiline destructuring format based on style guide 2016-01-18 14:46:39 +01:00
Brett Sun
aa00415a83 Merge with master 2016-01-18 14:15:19 +01:00
Brett Sun
d31a827447 Remove unused GlobalAction component 2016-01-18 14:06:24 +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
d805c1758c Merge pull request #60 from ascribe/AD-1443-open-edition-lists-not-refreshing 
AD-1443 Attempt to show as much of the original edition list as possible on refresh
 2016-01-18 10:26:51 +01:00
Brett Sun
4f21b5d4d7 Refactor MarketSubmitButton to rely on the extra data from its given editions instead of fetching from the PieceStore 2016-01-15 17:56:32 +01:00
Brett Sun
a24ad3b774 Add handleCancel callback to ModalWrapper 2016-01-15 17:55:34 +01:00
Brett Sun
e84206149c wip 2016-01-15 17:18:17 +01:00
Brett Sun
4c4e5e0004 Load piece when necessary in MarketRegisterPiece 2016-01-15 17:18:05 +01:00
Brett Sun
8d9df43339 Clean up whitelabel AdditionalDataForms 2016-01-15 17:17:34 +01:00
Brett Sun
50129b9d0c Refactor MarketSubmitButton to pull the piece as necessary rather than always fetching it in MarketAdditionalDataForm 2016-01-15 14:22:28 +01:00
Brett Sun
31bec7f2f8 Remove extraneous call for fetching webhook events 
Successfully fetching the webhooks will fetch the events as well.
 2016-01-15 14:00:36 +01:00
Brett Sun
91c97afb7c Small clean up for WebhookSettings 2016-01-15 13:59:41 +01:00
Brett Sun
587b58a500 Fix 404 not being detected properly on piece and edition detail 2016-01-15 13:00:09 +01:00
Brett Sun
bc7515ffe7 Allow ModalWrapper triggers to have an onClick handler 2016-01-15 11:54:16 +01:00
Brett Sun
7a53d539a6 Small fixes for components using pieces and editions 2016-01-14 16:31:19 +01:00
Brett Sun
3e67e2d2ee PieceId should only ever be a number if passed as a prop 2016-01-14 14:52:33 +01:00
Brett Sun
7136f2ce6c Add getInitialState and source pattern for PieceStore 2016-01-14 13:20:45 +01:00
Brett Sun
a5442e5acd Add getInitialState pattern for EditionStore 2016-01-13 17:24:32 +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
1ffa1eb6aa Fix potential race condition causing ProxyHandler to not evaluate its redirect functions if the component doesn't get updated 2016-01-13 16:03:08 +01:00
Brett Sun
cc9fa2378f Remove unnecessary duplication of updating encoding status in Edition 
Also reduces the time between each update to 5s since 10s feels way too
long.
 2016-01-12 17:55:37 +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
5b2178eb7e Use height for landing page logos 
Using height means the browser can allocate space for the image before
it loads, so there’s no flash of movement
 2016-01-12 15:06:43 +01:00
Brett Sun
315e5f0108 Add .isRequired to App proptypes 2016-01-12 15:05:00 +01:00
Brett Sun
1dca764166 Use Link instead of an anchor for AccordionList's empty placeholder to avoid page refresh 2016-01-12 12:34:55 +01:00
Brett Sun
ed264d8511 Fix MediaContainer not being refreshed while in Edition 2016-01-11 19:34:39 +01:00
Brett Sun
40041197d6 Update components for loading WhitelabelStore from top level app 2016-01-11 19:22:25 +01:00
Brett Sun
4133922f31 Fix a few small additions/deletions with UserActions 2016-01-11 19:10:24 +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
9059ca184a Remove previously missed imports from ContractSettings 2016-01-11 18:26:39 +01:00
Brett Sun
d867a3d9c1 Change SignupForm for loading UserStore from top level app 2016-01-11 18:24:55 +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
58f57af932 Remove unused props in LoginForm 2016-01-11 18:07:52 +01:00
Brett Sun
eafa675760 Small code style changes 2016-01-11 17:57:35 +01:00
Brett Sun
8531b77633 Merge with master 2016-01-11 17:52:32 +01:00
Brett Sun
a6463087c0 Merge pull request #76 from ascribe/cleanup-mediacontainer 
Clean up MediaContainer
 2016-01-11 17:49:52 +01:00
Brett Sun
d4bb00168c Change AclButtonList and parents for loading UserStore from top level app 2016-01-11 17:41:31 +01:00
Brett Sun
fbb35915eb Update market routes for loading user and whitelabel settings in top level app 2016-01-11 16:57:48 +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
723f93e629 Update CC routes for loading user and whitelabel settings in top level app 2016-01-11 16:28:27 +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
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
5ae166edf3 Add AppRouteWrapper to handle passing down props to routes 2016-01-11 14:00:09 +01:00
Brett Sun
d622ddac06 Load current user and whitelabel settings in AscribeApp 2016-01-11 12:54:15 +01:00
Brett Sun
cc16508e64 Merge with master 2016-01-11 11:59:35 +01:00
Brett Sun
0e67784e93 Remove unnecessary div in PieceListToolbarOrderWidget 
Also renames some variables in PieceListToolbarFilterWidget for
readability
 2016-01-11 11:49:27 +01:00
Brett Sun
455232049d Merge with master 2016-01-11 11:36:50 +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
19841ce6c4 Refactor EventActions and UserStore to more cleanly handle user authentication and log out events 2016-01-08 14:59:45 +01:00
Brett Sun
74a587906b Add anchorize utility to textareas 
And Tim thought this was going to be a piece of cake… next time he can
play with the url regex.
 2016-01-07 18:29:55 +01:00
Brett Sun
cf6dbb26f3 Fix loading of Facebook share button 2016-01-06 15:13:09 +01:00
Brett Sun
e76a36621e Use correct prize_round parameter 2016-01-05 19:45:49 +01:00
Brett Sun
41c9a10c84 Use a default shouldRedirect that just always returns true 2016-01-05 17:28:45 +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
15a2bfae9a Fix check for coa 2016-01-04 18:06:26 +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
591882618b Merge pull request #88 from ascribe/AD-1344-users-want-pretty-detail-page-to-print 
AD-1344 Users want pretty detail page to print
 2015-12-23 11:22:01 +01:00
Brett Sun
d817b920b4 Use class to add overflow ellipsis instead of directly styling component 2015-12-23 10:20:56 +01:00
Brett Sun
0f8499dfee Use getLangText for COA Intercom message 2015-12-23 09:50:38 +01:00
Brett Sun
5b34d569f6 Don't expand some anchor links in print 2015-12-23 09:48:45 +01:00
Brett Sun
2dc036047f Substitute upload button for placeholder text in print 2015-12-23 09:47:30 +01:00
Brett Sun
1eea6c2cb2 Substitute COA for placeholder text in print 2015-12-23 09:46:30 +01:00
Brett Sun
6c9e108b72 Hide unnecessary items from the piece and edition details in print 2015-12-23 09:39:02 +01:00
Brett Sun
8ec7023b8f Force piece and edition layout to be two columns 2015-12-23 09:37:03 +01:00
Brett Sun
c4da6a2dfc Hide footer in print 2015-12-23 09:36:21 +01:00
Brett Sun
eda479a51c Change header to be just logo in print 2015-12-23 09:36:08 +01:00
Brett Sun
cf6d653c68 Small code style fixes 2015-12-23 09:33:25 +01:00
Brett Sun
8a70f0acc5 Hotfix portfolio review cover image text to show correct 5mb limit 2015-12-22 19:37:44 +01:00
Brett Sun
b5fc811789 Merge pull request #77 from ascribe/pr-show-server-error-response 
Show server error in failed piece registration notifications on Portfolio Review
 2015-12-22 19:27:30 +01:00
Brett Sun
2bb04ff4f0 Merge pull request #86 from ascribe/AD-1530-limit-thumbnail-upload-size 
Limit thumbnail size to 5mb
 2015-12-22 19:26:58 +01:00
Brett Sun
9c51db34da Merge pull request #85 from ascribe/AD-1530-optimize-thumbnail-uploads 
AD-1530 Use the 300x300 thumbnail if available
 2015-12-22 19:26:49 +01:00
Brett Sun
58cd68f1c4 Change Portfolio Review closing date to be Dec. 27th 2015-12-22 10:36:05 +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
ce9493e3dd Use the 300x300 thumbnail if available 2015-12-21 14:46:10 +01:00
Brett Sun
e3c9ebe5f3 Limit thumbnail size to 5mb 2015-12-21 11:53:27 +01:00
Brett Sun
1e83de0b90 Merge pull request #61 from ascribe/AD-1484-hide-PieceListToolbarFilterWidget-if-no-filters-applicable 
Hide PieceListToolbarFilterWidget when no filters are applicable
 2015-12-21 11:49:29 +01:00
Brett Sun
ebd575caa3 Add prop to hide label of UploadButton 2015-12-21 11:46:46 +01:00
Brett Sun
3467e9f526 Make behaviour of ContractSettingsUpdateButton more robust 
Also fixes the “Contract could not be updated” notification that would
occur after every attempt to update the contract.
 2015-12-21 11:45:50 +01:00
Brett Sun
5a497bae59 Small cleanups and fixes for spacing, unused props, etc 2015-12-21 11:44:13 +01:00
Brett Sun
418022dff5 wip 2015-12-21 11:40:59 +01:00
Brett Sun
6f7a69fb93 Change ColumnModel's displayName to displayElement 2015-12-18 15:29:20 +01:00
Brett Sun
b7d731f8f3 Use object to construct ColumnModel to improve readability 2015-12-18 15:24:01 +01:00
Brett Sun
d6a9873bd0 Use object to construct TransitionModel to improve readability 2015-12-18 15:13:01 +01:00
Brett Sun
7d91832d74 Fix formatting and use destructuring 2015-12-18 15:12:29 +01:00
Brett Sun
614bc3f74b Small form fixes 2015-12-18 15:00:52 +01:00
Brett Sun
db2b027656 Fix defaultValue not being initially set for InputDate 2015-12-18 15:00:37 +01:00
Brett Sun
989fd8ea5c Fix React warnings 2015-12-18 14:59:15 +01:00
Brett Sun
8ff747e117 Componentize the action available for selected prizes 2015-12-18 14:57:52 +01:00
Brett Sun
311d03d09c Also execute child's handleSuccess() instead of just overwriting it in ModalWrapper 2015-12-18 14:57:10 +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
1580dd8f52 Small additional info for logging COA errors 2015-12-17 16:40:38 +01:00
Brett Sun
95bce14220 Merge pull request #79 from ascribe/hotfix-contract-creation 
Hotfix contract agreement creation failing on first time
 2015-12-17 13:12:37 +01:00
Brett Sun
41df6fe837 Add global notification to form validation 2015-12-17 13:05:39 +01:00
Brett Sun
ad17a9d6f3 Show server error in notification if one is given for failed piece registrations 2015-12-16 18:14:06 +01:00
Brett Sun
84ee8f6a9b Use the right property on Image for previewing 2015-12-16 17:50:09 +01:00
Brett Sun
1fc1337207 Fix React warnings 2015-12-16 17:49:47 +01:00
Brett Sun
f2f775f20c Carry down currentUser as prop to MediaContainer instead of adding state 2015-12-16 17:49:30 +01:00
Brett Sun
9f553f973c Check for the checkbox being unchecked before reseting value 2015-12-16 15:45:54 +01:00
Brett Sun
b971d516cc Fix PR feedback for Cyland loan button 2015-12-16 15:33:00 +01:00
Brett Sun
f4227e9906 Update form's email state if the email prop changes 2015-12-16 15:17:47 +01:00
Brett Sun
fb917f1a09 Reset the Property value when its checkbox is unselected 
The user doesn’t want to apply the property, so it should reset to
whatever it is by default.
 2015-12-16 14:50:39 +01:00
Brett Sun
75fe89a0ff Limit edition creation to between 1-100 2015-12-16 14:48:43 +01:00
Brett Sun
e3c4e54386 Reverse order of Cyland loan form buttons 
Maintains consistency with other buttons on the web app.
 2015-12-16 14:24:03 +01:00
Brett Sun
e7c29d0d98 Cyland Admin should also not be able to register work 
As per (AD-1504)[https://ascribe.atlassian.net/browse/AD-1504], Cyland
admin should not be able to register work, but instead use another
account to get loaned work.
 2015-12-16 13:59:31 +01:00
Brett Sun
94e20d2ba8 Remove unnecessary button class 2015-12-16 12:45:21 +01:00
Brett Sun
764b9dbf12 Remove leftover function from previous functionality that was removed 2015-12-16 12:44:50 +01:00
Brett Sun
7fbe8a311b Use col-xs instead of col-sm to handle mobile screens on white label landing pages 2015-12-16 12:43:43 +01:00
Brett Sun
1ea89313ff Add custom buttons to loan form for Cyland registration 2015-12-16 12:43:03 +01:00
Brett Sun
1de06b0ac5 Only show register work route if user can submit to wallet for IkonoTV, Lumenus 2015-12-14 18:59:10 +01:00
Brett Sun
b3b94b6f60 Fix spacing of WalletRoutes 2015-12-14 18:58:33 +01:00
Brett Sun
08025cc427 Remove unused showAddWork property from Header 2015-12-14 18:58:05 +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
Brett Sun
cef2785438 Hot fix to show edition even if not logged on 2015-12-14 17:00:04 +01:00
Brett Sun
8aae923388 Merge pull request #68 from ascribe/PR-hotfixes 
PR hotfixes
 2015-12-14 16:57:51 +01:00
Brett Sun
33db8e2cbe Merge pull request #67 from ascribe/AD-1362-implement-portfolioreview-judging-flow 
Use mime types for <input>'s accept property
 2015-12-14 16:32:14 +01:00
Brett Sun
5aaf02b0b4 Fire profileDidLoad event in PR to load intercom 2015-12-14 16:30:38 +01:00
Brett Sun
e24c9c9c74 Small change to PR piece registration 
Ignore `success` return of request, as requests will error if this is
returned false.
 2015-12-14 14:34:13 +01:00
Brett Sun
9342262f5c Move ignoreSentry parameter of logGlobal to be last in parameter list 2015-12-14 14:31:53 +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
be2f9bbc97 Make sure uploaded file from UploadButton has been linked with S3 before we try deleting it 2015-12-14 12:08:49 +01:00
Brett Sun
3286ef77bf Add 404 handling to prizes' piece container 2015-12-14 11:57:14 +01:00
Brett Sun
bee420a919 Small fixes for PR's otherdata fileClass 2015-12-14 11:57:10 +01:00
Brett Sun
8f98251735 Add additional comment for Safari behaviour of input's accept property 2015-12-14 11:41:06 +01:00
Brett Sun
38ef18a192 Hotfix for sending contract agreements without appendices 2015-12-11 11:15:17 +01:00