ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,624 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

2624 Commits

Author SHA1 Message Date
Tim Daubenschütz d5c3024375 Hotfix: Center polline and artcity landing 2016-02-09 14:09:14 +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 30f0008a28 Hotfix for missed PieceListToolbarWidget style renaming 2016-02-09 10:46:18 +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 2b7c218a40 Merge pull request #155 from ascribe/fix-webhook-dispatch-collision 
Revert removal of altUser
 2016-02-08 18:35:26 +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 2ad0ef69bb Merge pull request #150 from ascribe/refactor-piece-list-toolbar-widget-css 
Refactor piece list toolbar widget css and remove btn-ascribe-add
 2016-02-08 12:28:09 +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 4883d44908 Merge pull request #152 from ascribe/AP-7-artcity-consignment-wallet 
Add routes and styling for artcity.ascribe.io
 2016-02-08 10:09:42 +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 9b0f06b8cf Github isn't updating the issue 2016-02-08 10:08:01 +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 6bcb190315 Merge pull request #151 from ascribe/AP-6-polline-consignment-wallet 
Add routes and styling for polline.ascribe.io
 2016-02-08 10:03:33 +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 3be515402c Merge pull request #101 from ascribe/AD-1387-refactor-global-state-to-be-top-level 
AD-1387 Refactor global state to be loaded from the top level App component
 2016-02-05 15:14:27 +01:00
Brett Sun 4d185ec664 Merge with master 2016-02-05 15:12:05 +01:00
Brett Sun a79c0f2784 Remove trailing trues on visual regression scripts 
Doesn’t seem to be eliminating the node failure logs, so we’ll use the
silent flag instead
 2016-02-05 14:43:20 +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 026261f8c7 Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet 2016-02-04 15:57:53 +01:00
Tim Daubenschütz c18b70f764 Remove sass comment 2016-02-04 15:57:38 +01:00
Tim Daubenschütz 1f783dbd84 Remove sass comment 2016-02-04 15:57:05 +01:00
Tim Daubenschütz d5f52e876e Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet 2016-02-04 15:53:36 +01:00
Tim Daubenschütz ac2319f231 Cleanup styles for polline.ascribe.io 2016-02-04 15:53:16 +01:00
Tim Daubenschütz 135f9f453f Cleanup styling for artcity.ascribe.io 2016-02-04 15:44:05 +01:00
Brett Sun 37608004e3 Merge pull request #78 from ascribe/AD-1521-refactor-property-padding 
Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
 2016-02-04 15:15:01 +01:00
Brett Sun 9c073bb73b Fix typo in gemini test output for environment configuration 2016-02-04 15:02:50 +01:00
Brett Sun 2c5b029e08 Merge pull request #99 from ascribe/AD-1396-log-404-page-views-when-previous-view-was-within-the-app 
AD-1396 Log 404 page views when previous view was within the app
 2016-02-04 14:56:45 +01:00
Tim Daubenschütz 88926998a8 Use whitelabel routes for wl-specific requests 2016-02-04 14:46:20 +01:00