ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity
2,546 Commits 115 Branches 0 Tags 13 MiB
e0401de1a3
Commit Graph

2106 Commits

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