Tim Daubenschütz
0dc4efdca1
Filter password_confirm for sentry
2016-03-03 11:15:09 +01:00
Tim Daubenschütz
627ace63cd
Add demo whitelabel page
2016-02-24 11:16:56 +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
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
