1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Commit Graph

2153 Commits

Author SHA1 Message Date
Brett Sun
ce9493e3dd Use the 300x300 thumbnail if available 2015-12-21 14:46:10 +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
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
6c5a2e0869 Load babel polyfill dependency but don't import
From the babel.io.github guys.
2015-12-17 16:09:47 +01:00
Brett Sun
d996967dd9 Merge pull request #81 from ascribe/AD-1524-coa-should-be-created-if-none-exists
If fetching COA results in 404, create a new COA
2015-12-17 16:03:10 +01:00
Brett Sun
e81341269d If fetching COA results in 404, created a new COA 2015-12-17 15:46:30 +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
b6ca964adb Fix contractAgreementList not updating correctly after initial creation 2015-12-17 11:01:49 +01:00
Brett Sun
875e98dd3b Merge pull request #75 from ascribe/AD-1506-cyland-loan-later-button
Fix PR feedback for Cyland loan button
2015-12-16 15:46:47 +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
0da3891d51 Merge pull request #70 from ascribe/fix-polyfill-import
Fix polyfill import
2015-12-16 14:25:06 +01:00
Brett Sun
5e46fb5c17 Merge pull request #72 from ascribe/AD-1506-cyland-loan-later-button
AD-1506 Cyland loan later button
2015-12-16 14:24:54 +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
8687b393bf Add slight padding to bottom of app so it doesn't look cut off 2015-12-16 12:45:40 +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
5ee3b07cc1 Revert "Hotfix for iOS Safari mergeOptions clashes"
This reverts commit 1b4c6938f6.

The actual problem was the late loading of the polyfills.
2015-12-15 16:26:49 +01:00
Brett Sun
274f149272 Make sure polyfill is loaded first by using import statement
ES6 `import` statements hoist their imports to the top of the file.
Using `require(‘babel/polyfill’)` actually loads the polyfill after the
other imports, causing errors.
2015-12-15 16:26:40 +01:00
Brett Sun
1b4c6938f6 Hotfix for iOS Safari mergeOptions clashes 2015-12-14 21:27:58 +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
d9615188b0 Only assume TypeError if request's response is null 2015-12-14 14:54:57 +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
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
Dimitri De Jonghe
b467a840a4 Merge pull request #53 from ascribe/AD-1362-implement-portfolioreview-judging-flow
Implement first cut of judging flow for portfolio review
2015-12-10 16:58:42 +01:00
Brett Sun
b9e41d5cba Use mergeOptions instead of Object.assign when merging sources to check for clashes 2015-12-10 15:42:33 +01:00
Brett Sun
b126de5c2d Add empty object defaults to stores that use sources
Avoids inconsistent state where the store might set `null` or
`undefined` due to the server’s response
2015-12-10 15:41:55 +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
7cc51f81d0 Fix user fetch dispatch collision since the PieceContainer also fetches the user 2015-12-10 12:42:23 +01:00