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

1940 Commits

Author SHA1 Message Date
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
Brett Sun
6e9b1ac181 Hotfix for header accessing undefined ref 
Sometimes `onRouteChange()` is triggered before the component’s refs
are available, so we have to check for them before setting their state.
 2015-12-10 19:19:01 +01:00
Brett Sun
482fa51e9e Finalize text changes 2015-12-10 18:56:19 +01:00
Brett Sun
e96e7ffa2b Use null to denote an empty React element instead of {} 2015-12-10 18:04:46 +01:00
Brett Sun
d5823f10ec Use mime types for input's accept property as safari doesn't play nicely with just the extensions 2015-12-10 17:54:33 +01:00
Brett Sun
268cbd55ad Add logout link to submitted piece's hero component 2015-12-10 15:15:56 +01:00
Brett Sun
c9d330c2bd Merge branch 'AD-1362-implement-portfolioreview-judging-flow' of github.com:ascribe/onion into AD-1362-implement-portfolioreview-judging-flow 2015-12-10 14:45:17 +01:00
diminator
51ff0295c0 refactor prize app to be compliant with whitelabel settings 2015-12-10 14:07:05 +01:00
Brett Sun
34153c2322 Avoid unauthorized attempts at fetching ratings if user isn't an admin, judge, or jury 2015-12-10 13:01:48 +01:00
Brett Sun
7cc51f81d0 Fix user fetch dispatch collision since the PieceContainer also fetches the user 2015-12-10 12:42:23 +01:00
Brett Sun
9b99e3ae09 Fix PR comments 2015-12-10 11:11:37 +01:00
Brett Sun
1ee9a4c7a1 Hide download button on the marketplace additional data form when it's not inline 2015-12-09 18:29:43 +01:00
Brett Sun
ffe88eb3bf Cherry pick from previous PR 2015-12-09 18:02:14 +01:00
diminator
3461a28f36 Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow 2015-12-09 16:48:33 +01:00
Tim Daubenschütz
8278f5404f Increase robustness of: 
- PieceListToolbarOrderWidget
	- PieceListToolbarFilterWidget
 2015-12-09 16:17:08 +01:00
Tim Daubenschütz
80df66ea5b Merge branch 'master' into AD-1484-hide-PieceListToolbarFilterWidget-if-no-filters-applicable 2015-12-09 16:11:05 +01:00
Brett Sun
e7cf9a44a0 Add simple check for determining if user's offline while uploading 2015-12-09 15:57:01 +01:00
Tim Daubenschütz
02af024609 Cosmetic changes in EditionContainer and CoaVerifyContainer 2015-12-09 15:56:47 +01:00
Tim Daubenschütz
b31872261d Add AuthPrizeRoleRedirect to missing routes 2015-12-09 14:00:00 +01:00
Tim Daubenschütz
0b63801d33 Merge branch 'master' into AD-1362-implement-portfolioreview-judging-flow 2015-12-09 13:49:40 +01:00
Tim Daubenschütz
3e8e7a40e7 Fix setState warning for EditionContainer 2015-12-09 13:28:11 +01:00
Tim Daubenschütz
057a278d19 In EditionStore use empty object instead of null as default state 2015-12-09 13:21:55 +01:00
diminator
02a9844ed7 Merge remote-tracking branch 'remotes/origin/master' into AD-290-coa-buttons-and-usage-esp-verify 2015-12-09 11:42:22 +01:00
diminator
7318d4e5df embed in edition 2015-12-09 11:41:46 +01:00
Brett Sun
4212b776ee Merge with master 2015-12-08 20:56:24 +01:00
Brett Sun
17a3ecbd44 Add thin cross icon to FileDragAndDropError 2015-12-08 20:48:39 +01:00
Brett Sun
511abc6a33 Fix missing PropType 2015-12-08 20:57:40 +01:00
Brett Sun
e0b35e0a24 Merge with master 2015-12-08 20:55:13 +01:00
Brett Sun
edeec39548 Small fixes for upload error behaviour 
* Change error dialog text slightly
* Only show global notification on first error
* Only create the S3 blob if the response is successful
 2015-12-08 20:25:18 +01:00
Brett Sun
5250427ce0 Use FileStatus in UploadButton, register form 2015-12-08 18:29:26 +01:00
Brett Sun
5bc447ecc8 Allow warnings to be set from inside properties to change appearance 2015-12-08 18:23:02 +01:00
Brett Sun
79780cfb3a Add FileDragAndDropError 2015-12-08 18:22:11 +01:00
diminator
4e3cf47d3f Merge branch 'AD-290-coa-buttons-and-usage-esp-verify' of github.com:ascribe/onion into AD-290-coa-buttons-and-usage-esp-verify 2015-12-08 18:17:30 +01:00
diminator
8226011e8a query_params in coa_verify 2015-12-08 18:17:08 +01:00
Brett Sun
04d7e6951a Don't render fileDragAndDropDialog if it's not needed 2015-12-08 18:16:11 +01:00
Brett Sun
a0db6d3037 Shuffle uploader props to be more readable 2015-12-08 18:09:24 +01:00
Tim Daubenschütz
4727646654 Add nice message for waiting user 2015-12-08 17:43:19 +01:00
Tim Daubenschütz
e8d5e0390d Improve robustness for server-side failing requests for COA 2015-12-08 17:38:04 +01:00
Tim Daubenschütz
02bb72970d Merge pull request #52 from ascribe/AD-1428-add-link-to-portfolio-review-website 
Add link to portfolio review website to registration form
 2015-12-08 17:23:31 +01:00
Brett Sun
f9e7355704 Add FAQ to footer 2015-12-08 17:18:03 +01:00
Tim Daubenschütz
d035f1e41c Hide PieceListToolbarFilterWidget when no filters are applicable 2015-12-08 16:49:06 +01:00
Tim Daubenschütz
32bc4b0c69 Add custom styling for PR 2015-12-08 16:43:45 +01:00
Brett Sun
b02f6d7695 Merge with master 2015-12-08 16:11:27 +01:00
Tim Daubenschütz
7e5662676c Add header to jury, judge and admin role 2015-12-08 15:44:46 +01:00
Tim Daubenschütz
e427429263 Implement AuthPrizeRoleRedirect 2015-12-08 15:21:20 +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
Brett Sun
349ea8518f Destructure params for fetchEditionList 2015-12-08 14:55:04 +01:00
Brett Sun
f82797bea3 Move compnentDidUpdate for ESLint warning 2015-12-08 14:48:44 +01:00
Tim Daubenschütz
2cc02d9599 Increase robustness of coa fetching routine 2015-12-08 14:18:31 +01:00
Brett Sun
4fa25ca446 Add option to specify the max edition to fetch and update the edition list to 2015-12-08 13:41:15 +01:00
Tim Daubenschütz
da75353b00 Refactor Edition endpoints to create Coa on demand properly 2015-12-08 13:28:47 +01:00
Brett Sun
8f3d8fafa6 Change fronted instances of 23vivi to be uppercase 2015-12-08 12:04:01 +01:00
Tim Daubenschütz
bf6b78c058 Revert "coa flush causes dispatcherror" 
This reverts commit eaed301155.
 2015-12-08 11:49:03 +01:00
diminator
eaed301155 coa flush causes dispatcherror 2015-12-08 11:46:30 +01:00
Tim Daubenschütz
50377ba478 Generalize ProxyHandler to take arbitrary redirect functions 2015-12-08 11:17:04 +01:00
Tim Daubenschütz
7cb5fa6758 Rename AuthProxyHandler to ProxyHandler and remove default export 2015-12-08 10:38:32 +01:00
Tim Daubenschütz
e1c2c2514c Move AuthProxyHandler one directory up 2015-12-08 10:23:37 +01:00
Tim Daubenschütz
6d5e3e1753 Add link to portfolio review website to registration form 2015-12-08 10:09:20 +01:00
Tim Daubenschütz
b8c58aa900 Add hotfix: do not unlisten history.js object 2015-12-07 17:41:10 +01:00
Brett Sun
7fdd534bc8 Hide thumbnail creation for marketplace white labels 
Thumbnails and marketplace images might become confusing to the user if
they are both available. In the future, we may want to change the
marketplace image to just be the thumbnail image.
 2015-12-07 17:24:13 +01:00
Tim Daubenschütz
23556b1b4c Merge pull request #34 from ascribe/add-pause-resume-to-global-notifications 
Implement pause and resume functionality to global notifications
 2015-12-07 17:22:02 +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
Tim Daubenschütz
3681260054 Return empty string if file without extension is submitted 2015-12-07 17:14:43 +01:00
Tim Daubenschütz
56d8726a0b Minor changes for integrating PR Feedback 2015-12-07 17:02:53 +01:00
Tim Daubenschütz
343d6bfea2 Fix a bug that locked submit button in disabled mode 2015-12-07 16:58:26 +01:00
Tim Daubenschütz
9c9c99c714 Show filename when uploading 2015-12-07 16:34:10 +01:00
Brett Sun
fd9ec413f2 Forgot to include white label piece containers in previous fix 2015-12-07 15:14:01 +01:00
Brett Sun
75e010f3fb Fix global notifications not showing initial transition 2015-12-07 14:31:18 +01:00
Tim Daubenschütz
ddfdaa30e7 Merge fixes 2015-12-07 14:01:17 +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
Tim Daubenschütz
2b6b78310c Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio 
AD-1177 display 404 on pieces and editio
 2015-12-07 11:49:39 +01:00
Tim Daubenschütz
3ce63c33bf Finalize ReactError component 2015-12-07 11:48:28 +01:00
diminator
f76ebffbe2 fix: acl_wallet_submit on 23vivi register piece 2015-12-07 11:17:42 +01:00
Tim Daubenschütz
45919f93a6 Merge pull request #32 from ascribe/AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null 
Ad 1342 public piece note doesnt render correctly def data null
 2015-12-07 11:00:39 +01:00
Tim Daubenschütz
4f39103baf Use Oops 2015-12-07 10:59:07 +01:00
Tim Daubenschütz
3374862edf Make monkeyPatched key specific to component's displayName 2015-12-07 10:57:49 +01:00
Brett Sun
d2aba04bea Change show condition on public note to be more stylistically similar 2015-12-07 10:52:00 +01:00
Tim Daubenschütz
2130b74a96 Merge pull request #42 from ascribe/AD-1434-hide-actions-in-detail-pages-if-they-re-not-available 
Display actions only if ACLs are available
 2015-12-07 10:49:07 +01:00
Tim Daubenschütz
9392a71b33 Add comment for bug fix hiding actions from detail pages 2015-12-07 10:48:46 +01:00
Tim Daubenschütz
b0b8af3305 Merge pull request #2 from ascribe/AD-1149-implement-lumenus-the-lumen-mark 
Implement marketplace wallets
 2015-12-07 10:37:22 +01:00
Brett Sun
41ef51c478 Revert "Add consign error to market white labels" 
This reverts commit cb972eb448.
Unfortunately, the edition's `acl_edit` can still be true when
the piece's `acl_edit` is false, so there is no good way on
the frontend right now to tell when to show the error message.

For now we'll assume submissions to marketplaces are all new
and ignore this edge case.
 2015-12-07 10:18:08 +01:00
Brett Sun
cb972eb448 Add consign error to market white labels 
Can you beliebe? Magical 100th commit.
 2015-12-04 18:30:45 +01:00
Brett Sun
c1959033c0 Fix comments in PR 2015-12-04 16:34:25 +01:00
Brett Sun
b43faf9b45 Fix multiple edition statuses 2015-12-04 16:29:57 +01:00
Brett Sun
0763c45548 Disable form when acl_edit is turned off 2015-12-04 15:35:01 +01:00
Brett Sun
5a6026d0ca Fix ListItemEditionWidget spinner's colour 2015-12-04 14:34:59 +01:00
Brett Sun
9d02877363 Fix customThumbnailPlacholder propType 2015-12-04 13:52:17 +01:00
Brett Sun
904a6ce15a Merge pull request #46 from ascribe/AD-1149-style-23vivi 
AD-1149 Style 23vivi
 2015-12-04 13:39:09 +01:00