8 Commits

Author	SHA1	Message	Date
Brett Sun	56044488d7	Replace mergeOptions with js-utility-belt's safeMerge ... And avoid using safeMerge when a normal Object.assign() would do.	2016-06-14 17:57:59 +02:00
Brett Sun	a4216db6d9	Remove redundant '_utils' suffix in util file names	2016-06-14 17:57:57 +02:00
Brett Sun	71dbad2a18	Add location to context	2016-06-08 14:54:05 +02:00
Brett Sun	b02695a33a	Convert whitelabel to be passed down through context and withWhitelabel HOC	2016-06-08 13:11:48 +02:00
Brett Sun	d1dba86b1a	Convert currentUser to be passed down through context and withCurrentUser HOC ... Similar to what react-router did with their router and withRouter HOC.	2016-06-07 14:56:35 +02:00
Brett Sun	c807f62297	Replace usage of history with router passed down through context	2016-06-06 16:10:41 +02:00
Brett Sun	d1dfdbdbec	Only import what we need from react-router ... Unfortunately webpack doesn’t understand jsnext:main declarations yet, so we have to do this ourselves by using react-router’s es6 build	2016-06-06 16:07:47 +02:00
Brett Sun	826ca08073	Merge with master	2016-02-05 10:38:59 +01:00