ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-30 21:52:08 +02:00
Code Issues Releases Wiki Activity
2,684 Commits 115 Branches 0 Tags 13 MiB
388e10471b
Commit Graph

1973 Commits

Author SHA1 Message Date
Brett Sun
af0b2109f9 Remove small unnecessary bits of logic in displaying notes 2016-05-02 11:14:52 +02:00
Brett Sun
a8df08c01e Show the public note on editions 
Public notes should be visible either when there is one already saved,
or if you can edit the field
 2016-05-02 11:13:24 +02:00
Brett Sun
c12a5f4977 Set the default editable status of the MarketFurtherDetails to be false 
Non-owners don't get provided an acl_edit in their edition acls, so the
default behaviour of MarketAdditionalDetailsForm was to set the form to
be editable.
 2016-04-25 17:32:59 +02:00
Tim Daubenschütz
6b147cdef9 Merge pull request #193 from ascribe/AG-162-stuck-piece-registration 
Hide button and spinner in form instead of replace
 2016-04-21 16:02:29 +02:00
tim
abebbe2e51 Hide button and spinner in form instead of replace 2016-04-21 13:27:55 +02:00
Brett Sun
702107258a Fix weird messaging IkonoTV empty further details placeholdher 2016-04-21 11:04:17 +02:00
tim
56b7071c87 Enable Amazon S3 Accelerate 2016-04-20 15:15:59 +02:00
tim
76daa7edc2 Add Liquid Gallery Whitelabel Page 2016-04-06 16:22:03 +02:00
Tim Daubenschütz
227cd2832d fix thumbnail rendering for video 2016-03-10 17:07:11 +01:00
Tim Daubenschütz
fe77d73979 Merge pull request #172 from ascribe/AG-171-support-tiff-submissions 
Add async tiff thumbnail encoding support
 2016-03-10 15:37:29 +01:00
Brett Sun
55f53247ea Merge pull request #174 from ascribe/fix-digital-work-file-name 
Use setTimeout instead of setInterval to refresh signed download urls
 2016-03-10 15:32:37 +01:00
Tim Daubenschütz
7a59960255 Restrict thumbnail expansion if file is TIFF 2016-03-10 15:09:22 +01:00
Tim Daubenschütz
4fdab505e7 Restructure MediaPlayer 
- encoding evaluation taken out to MediaContainer
 2016-03-10 14:33:54 +01:00
Brett Sun
8f12e12bcc Move header_notification to be in sync with its component's name 2016-03-10 13:43:07 +01:00
Brett Sun
30911b5395 Make notification fetching dependent on if the current user is available 2016-03-10 13:41:36 +01:00
Brett Sun
114129588e Improve DRYness of HeaderNotification 2016-03-10 13:15:26 +01:00
Brett Sun
4cd093aaa8 Ignore global notifications that do not contain a message 2016-03-10 12:45:21 +01:00
Brett Sun
65c37b2c74 Use setTimeout instead of setInterval to refresh signed download urls 2016-03-10 12:06:58 +01:00
Tim Daubenschütz
e0401de1a3 Add async tiff thumbnail encoding support 
- Fixes #171
 2016-03-09 16:54:11 +01:00
Tim Daubenschütz
5e6b483149 Merge pull request #169 from ascribe/AG-112-visual-changes-to-23vivi 
Ag 112 visual changes to 23vivi
 2016-03-07 14:14:11 +01:00
Tim Daubenschütz
1edfca48c8 Fix minor indentation issue 2016-03-07 14:09:51 +01:00
Tim Daubenschütz
bc3093d4d7 Whitelabel login form 
- also make some changes to signup form
 2016-03-07 14:04:34 +01:00
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
66e4591a56 Whitelabel signup form 2016-03-04 14:27:56 +01:00
Tim Daubenschütz
73ff516078 Add Date of registration to detail pages 2016-03-04 11:10:58 +01:00
Tim Daubenschütz
69dd08751b Merge pull request #165 from ascribe/AG-161-filter-password_confirm-for-sentry 
Filter password_confirm for sentry
 2016-03-03 11:16:42 +01:00
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
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
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
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
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
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