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,511 Commits 115 Branches 0 Tags 13 MiB
cosmetic-fix-for-multiline-destructure
Commit Graph

1879 Commits

Author SHA1 Message Date
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