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

2511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Daubenschütz
0a17ec0414 Use whitelabel routes for wl-specific requests 2016-02-04 14:45:46 +01:00
Brett Sun
0a4d19677f Merge with master 2016-02-04 14:00:03 +01:00
Tim Daubenschütz
38aa567ab5 Add artcity to README.md 2016-02-04 13:50:56 +01:00
Tim Daubenschütz
f12630dfad Add routes and styling for artcity.ascribe.io 2016-02-04 13:44:45 +01:00
Brett Sun
3bb1f65f38 Add whitespace for different npm test scripts 2016-02-04 13:40:40 +01:00
Brett Sun
f1b677dbd1 Use the activeRoute prop to generate route classnames on whitelabels 2016-02-04 13:32:06 +01:00
Brett Sun
8f2ace77af Use previous method from white labels to get the current active route 2016-02-04 13:32:06 +01:00
Brett Sun
6f2424d103 Rebase remerge 2016-02-04 13:32:00 +01:00
Brett Sun
e616576fa5 Hide the footer if a route has the hideFooter attribute 2016-02-04 13:31:19 +01:00
Brett Sun
764f81925b Change children prop from react-router to only be a Element type 
Judging by
https://github.com/rackt/react-router/blob/master/docs/API.md#children-1
and a few inspections in the code, as well as tests, the `children`
prop injected into routes can only ever be a single React Element
object.

This allows us to easily get the active route of a child (if there is
an active route) by querying the `children`’s route prop.
 2016-02-04 13:31:18 +01:00
Brett Sun
83012200d1 Separate Sluice styling away from SimplePrize styling 2016-02-04 13:31:18 +01:00
Brett Sun
4e13376d5f Add route class names to prize app 2016-02-04 13:31:18 +01:00
Brett Sun
39417f3d11 Change screenshot folder for visual tests 2016-02-04 13:31:18 +01:00