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,683 Commits 115 Branches 0 Tags 13 MiB
6eac3663d0
Commit Graph

2197 Commits

Author SHA1 Message Date
Tim Daubenschütz
0dc4efdca1 Filter password_confirm for sentry 2016-03-03 11:15:09 +01:00
Tim Daubenschütz
5b79648385 Merge pull request #153 from ascribe/fix-digital-work-file-name 
Fix digital work file name download
 2016-03-03 10:05:13 +01:00
Tim Daubenschütz
64d0dd008e Correct timer variable name 2016-03-03 10:04:45 +01:00
Tim Daubenschütz
e863349531 Refactor to comply with PR feedback 2016-03-01 12:55:27 +01:00
Tim Daubenschütz
627ace63cd Add demo whitelabel page 2016-02-24 11:16:56 +01:00
Tim Daubenschütz
b2a21c5cc1 Resign url based on setInterval 2016-02-22 17:38:02 +01:00
Tim Daubenschütz
23efaa368e Apply PR feedback 2016-02-22 12:18:40 +01:00
Tim Daubenschütz
f2c7f02480 Add component for signing S3 url 2016-02-17 11:38:01 +01:00
Brett Sun
dcdae7b7b1 Merge pull request #156 from ascribe/AG-114-show-visual-add-for-cosign-wallet-uneditable-works 
AG-114 Show visual aid for uneditable works in consign wallet
 2016-02-10 13:40:26 +01:00
Brett Sun
9e0efd5140 Small warnings fix for bool props 2016-02-09 12:07:23 +01:00
Brett Sun
e17347a98c Add error modal for uneditable marketplace editions that cannot be consigned due to missing fields 2016-02-09 12:07:09 +01:00
Brett Sun
28ed1473d6 Hotfix for uploader merge error 2016-02-09 10:20:32 +01:00
Brett Sun
57b1ef6b41 Hotfix revert on altUser for logging out on whitelabels 2016-02-09 09:40:27 +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
Tim Daubenschütz
8b0f27a17d Merge pull request #154 from ascribe/fix-getlangtext 
Fix missing cases of getLangText
 2016-02-09 09:25:49 +01:00
Brett Sun
d5b71ca438 Fix bool warning for showing webhook events 2016-02-08 17:53:58 +01:00
Brett Sun
8f2a93ff39 Revert "Remove altUser since the UserStore is now always being passed as a prop" 
This reverts commit 325651b581.
 2016-02-08 17:49:11 +01:00
Tim Daubenschütz
2cb8fb2dd9 Replace bootstrap button with proper dl-link 2016-02-08 16:44:27 +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
d95bdc0913 Merge with master 2016-02-08 11:43:02 +01:00
Brett Sun
4c821bd744 Merge pull request #35 from ascribe/AD-1360-show-common-upload-errors-to-user 
Show more detailed upload errors and suggest solutions
 2016-02-08 11:36:35 +01:00
Brett Sun
028058a12f Small things that could only be fixed after merging 2016-02-08 11:03:41 +01:00
Brett Sun
537d6d52e8 Small fixes for warnings 2016-02-08 10:41:36 +01:00
Brett Sun
91f9e83e81 Fix FileDragAndDropDialog merge mistake 2016-02-08 10:40:46 +01:00
Tim Daubenschütz
e69dc21518 Merge branch 'master' into AP-7-artcity-consignment-wallet 
Ok, it was my fault...

Conflicts:
	js/components/whitelabel/wallet/wallet_app.js
 2016-02-08 10:09:14 +01:00
Tim Daubenschütz
030a86e883 Merge branch 'master' into AP-7-artcity-consignment-wallet 
Conflicts:
	js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
	js/components/whitelabel/wallet/wallet_app.js
 2016-02-08 10:05:35 +01:00
Tim Daubenschütz
373d9d13a7 Merge branch 'master' into AP-6-polline-consignment-wallet 
Conflicts:
	js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
	js/components/whitelabel/wallet/wallet_app.js
 2016-02-08 10:03:06 +01:00
Brett Sun
a4292f09c3 Merge with master 2016-02-05 17:06:16 +01:00
Brett Sun
acd7c0f0a3 Fix PR comments 2016-02-05 15:17:59 +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
01b258334a Fix register work visual test 2016-02-05 14:21:31 +01:00
Brett Sun
325651b581 Remove altUser since the UserStore is now always being passed as a prop 
Also don’t recycle altWhitelabel on logout as the whitelabel stores
aren’t dependent on the user.
 2016-02-05 13:12:58 +01:00
Brett Sun
a020ed6a28 Revert against 8927ccb847 
Apparently the lack of the `setDropdownState` function is what causes
the page refresh to happen when clicking on a header notification…
 2016-02-05 12:04:23 +01:00
Brett Sun
15cf6498a8 Remove unused Cyland hero component 2016-02-05 11:54:02 +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
8927ccb847 Guard against the notification dropdown button missing a function 2016-02-05 10:39:24 +01:00
Brett Sun
826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Tim Daubenschütz
88926998a8 Use whitelabel routes for wl-specific requests 2016-02-04 14:46:20 +01:00
Tim Daubenschütz
0a17ec0414 Use whitelabel routes for wl-specific requests 2016-02-04 14:45:46 +01:00
Tim Daubenschütz
f12630dfad Add routes and styling for artcity.ascribe.io 2016-02-04 13:44:45 +01:00
Tim Daubenschütz
7dfe6a51a4 For 23vivi, switch back to appropriate piece list 2016-02-04 11:51:54 +01:00
Tim Daubenschütz
f6a5734871 Add routes and styling for polline.ascribe.io 2016-02-04 10:54:38 +01:00
Tim Daubenschütz
c0e55a1829 Merge pull request #147 from ascribe/AG-144-wallet-owner-should-not-be-redirected 
Fix redirection of wallet owners
 2016-02-02 10:23:57 +01:00
Brett Sun
eaaaa3bb76 Merge pull request #82 from ascribe/fix-input-date 
Fix InputDate's initial evaluation of defaultValue
 2016-02-01 15:45:40 +01:00
Tim Daubenschütz
b405bc675b Fix PR feedback 2016-02-01 14:47:51 +01:00
Tim Daubenschütz
e2a481a3f0 Fix redirection of wallet owners 
This also fixes a problem where newly created
users would be redirected to a 404 page.
 2016-02-01 13:50:55 +01:00
Tim Daubenschütz
f2542f99bd Merge pull request #141 from ascribe/AG-139-specific-file-formats-leads-to-wrong-preview-sizing 
AG-139 Extract extension using file name rather that mime type for uploader preview
 2016-01-28 10:03:18 +01:00
Brett Sun
f06ad6597c Refactor PieceListToolbarWidget CSS 2016-01-27 15:01:33 +01:00
Brett Sun
0d01ae1642 Remove unused btn-ascribe-add in PieceList 2016-01-27 15:01:08 +01:00
Tim Daubenschütz
8f7d4ccc2c Increase file size limit to 50GB 
- Customer request
 2016-01-27 11:32:23 +01:00
Brett Sun
627b2f75fe Extract extension using file name rather that mime type for uploader preview 
Also adds ellipsis overflow to the extension name to prevent long
extensions from resizing the preview element and removes redundant
`.file-drag-and-drop-preview-table-wrapper` class
 2016-01-26 13:41:15 +01:00
Tim Daubenschütz
83eadf8528 Merge pull request #119 from ascribe/AG-109-marketplace-thumbnail-uploader-does-not-use-validation 
AG-109 Marketplace thumbnail uploader does not use validation
 2016-01-26 11:58:51 +01:00
Brett Sun
be081b6655 Fix check for allowed extensions in ReactS3FineUploader 2016-01-26 11:34:12 +01:00
Brett Sun
ba3c7db6cd Reorder methods in ReactS3FineUploader 2016-01-26 11:33:38 +01:00
Tim Daubenschütz
d8f2423344 Merge pull request #95 from ascribe/add-default-should-redirect 
Collection should redirect to Register Work when a user does not have pieces yet
 2016-01-26 11:08:32 +01:00
Tim Daubenschütz
3d43cd8505 Remove 'disabledOn' for prize routes 2016-01-26 11:07:41 +01:00
Tim Daubenschütz
74c8abdf51 Merge pull request #135 from ascribe/AG-124-display-correct-file-type-in-download-button 
Fix wrong file endings for files that do not have extensions
 2016-01-26 10:47:37 +01:00
Tim Daubenschütz
79a1dc0e08 Fix wrong file endings for files that do not have extensions 
Closes #130
 2016-01-25 11:01:28 +01:00
Tim Daubenschütz
4088857d67 Fix property naming for Fetcher to fix "Show more" dialog 
Closes #131
 2016-01-25 10:23:20 +01:00
Brett Sun
64c02d4d65 Remove duplicate 'name' propType in PieceExtraDataForm 
You would not believe how much pain this has caused me with PhantomJS...
 2016-01-22 00:03:49 +01:00
Tim Daubenschütz
9f0a071473 Merge pull request #128 from ascribe/AG-127-remove-hash-option-for-thumbnail 
Remove hash option for thumbnail
 2016-01-21 17:33:17 +01:00
Brett Sun
aef3bf5094 Remove hash option for thumbnail 2016-01-21 17:20:45 +01:00
Tim Daubenschütz
26455b856c Merge pull request #125 from ascribe/AG-124-display-correct-file-type-in-download-button 
Extract file extension from amazon S3 link
 2016-01-21 17:14:25 +01:00
Brett Sun
27f1b7e9b4 Add default redirect for empty collections 2016-01-21 16:47:57 +01:00
Brett Sun
9559bc09b4 Disable 'Collection' header item when no pieces are found for the user 
The disabling only happens when the piece list is fetched, which may
not happen immediately in some cases (ie. logged in user goes straight
to another person’s edition first). We’re not able to fetch the piece
list immediately, as some white labels apply default filters on the
piece list which forces them to wait until they can begin fetching
their piece lists.
 2016-01-21 16:47:35 +01:00
Tim Daubenschütz
d9755f3563 Extract file extension from amazon S3 link 2016-01-21 16:24:17 +01:00
Tim Daubenschütz
b81cd76d10 Change language in detail pages: 
- "BY" => "CREATED BY"
- "REGISTREE" => "ASCRIBED BY"
 2016-01-21 15:17:19 +01:00
Brett Sun
9b1e6cc8a1 Small stylistic changes to Header and NavRoutes 2016-01-21 15:11:19 +01:00
Tim Daubenschütz
80b4e22435 Cancel dragged invalid file with proper messaging 2016-01-21 13:53:14 +01:00
Brett Sun
4dd701a414 Add extension validation to marketplace thumbnail uploader 2016-01-21 12:24:31 +01:00
Brett Sun
af59531fe7 Move fine uploader validation constants into their own file 2016-01-21 12:24:15 +01:00
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
7b9c9eca24 Merge with master 2016-01-19 16:39:19 +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
b24e66ed11 Fix logout not working properly after moving logic to UserStore 2016-01-18 19:14:34 +01:00
Brett Sun
0382704098 Merge pull request #100 from ascribe/AD-1453-add-functionality-to-avoid-sending-error-messages-to-sentry 
Use Raven's `ignoreErrors` configuration option to ignore certain errors
 2016-01-18 18:30:38 +01:00
Brett Sun
3587a7ae4f Merge pull request #102 from ascribe/remove-unused-prize-list-components 
Remove unused PrizeList store and action
 2016-01-18 18:29:44 +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
ef33149920 Merge pull request #106 from ascribe/remove-global-action-component 
Remove unused GlobalAction component
 2016-01-18 14:10:42 +01:00
Brett Sun
1333543e22 Merge pull request #104 from ascribe/use-parameters-in-calls-to-sources 
Pass parameters to sources as opposed to using state
 2016-01-18 14:09:07 +01:00
Brett Sun
85875309c1 Remove StoreUtils since it's no longer necessary 2016-01-18 14:08:46 +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
bc17dd4bad Small cosmetic changes 2016-01-18 10:17:49 +01:00
Brett Sun
47e0ff703d Merge pull request #93 from ascribe/add-classlist-polyfill 
Add classList polyfill
 2016-01-18 10:04:33 +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
c6071d8ab4 Merge branch 'use-parameters-in-calls-to-sources' into AD-1558-piece-and-edition-detail-show-stale-data 
Merge with update to the pattern used in sources
 2016-01-15 14:20:18 +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
b3d6620f73 Simplify example in naming conventions for sources 2016-01-15 13:58:15 +01:00
Brett Sun
f4eef6b7c8 Prevent empty change events being fired on actions that just delegate to sources 2016-01-15 13:56:56 +01:00
Brett Sun
e5a8ebd623 Use parameters instead of meta objects in state to pass information to sources 2016-01-15 13:55:58 +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
03490b8c63 Fixes for converting pieceFetcher into store 2016-01-14 16:44:52 +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
ea18b31db1 Small style changes for Piece and Edition ListStores 2016-01-13 17:14:09 +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
72db69ee9e Remove unused PrizeList store and action 2016-01-13 16:17:31 +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
f31d6352eb Merge general_utils.js from #35 for selectFromObject 2016-01-11 17:09:17 +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