Commit Graph

40 Commits

Author SHA1 Message Date
tim 76daa7edc2 Add Liquid Gallery Whitelabel Page 2016-04-06 16:22:03 +02: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 627ace63cd Add demo whitelabel page 2016-02-24 11:16:56 +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
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 826ca08073 Merge with master 2016-02-05 10:38:59 +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 f6a5734871 Add routes and styling for polline.ascribe.io 2016-02-04 10:54:38 +01:00
Brett Sun 2ad2ea242d Changes for PR comments 2016-01-18 17:31:56 +01:00
Brett Sun 315e5f0108 Add `.isRequired` to App proptypes 2016-01-12 15:05:00 +01:00
Brett Sun d4064ee83a Change Header and parents for loading UserStore from top level app 2016-01-11 18:41:07 +01:00
Brett Sun 443be236f5 Whitespace fix for comments 2016-01-11 16:26:36 +01:00
Brett Sun 08025cc427 Remove unused `showAddWork` property from Header 2015-12-14 18:58:05 +01:00
Brett Sun 43916625bd Remove header from white labels that have landing pages 2015-12-03 12:41:59 +01:00
Tim Daubenschütz f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
diminator b54beae322 cyland
cc
2015-10-14 17:13:16 +02:00
Tim Daubenschütz 69afc6165a Incorporate new RedirectProxyRoute into whitelabel pages 2015-10-09 15:19:24 +02:00
Tim Daubenschütz b95906d83e Fix whitelabel styling 2015-10-01 16:11:29 +02:00
Tim Daubenschütz 9a17e44df1 Refactor of wallet app routing 2015-10-01 15:57:46 +02:00
Tim Daubenschütz 8ba6f11dfe Fix AccordionListTable item links and missing location propagation 2015-10-01 14:54:56 +02:00
Tim Daubenschütz d399027dd6 Fix isActive reference 2015-10-01 14:34:46 +02:00
Tim Daubenschütz 829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
Tim Daubenschütz d50d0faabe Write generic function for extracting subdomain and implement troughout whole app 2015-09-29 14:58:56 +02:00
Tim Daubenschütz bd5aa266b1 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-22 13:38:31 +02:00
vrde 865c21557c Add style for buttons 2015-09-21 16:23:18 +02:00
diminator 9bfd50e3bc Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
Conflicts:
	js/components/signup_container.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
2015-09-21 10:21:44 +02:00
vrde 7be3c8b469 Add style for signup and login 2015-09-18 15:36:01 +02:00
vrde 03803ca61a Add active routes as css classes 2015-09-18 14:25:31 +02:00
vrde b76ffcde73 Finish styling for landing page 2015-09-18 13:46:15 +02:00
diminator 5c2ec3ffb0 bug fix signup query
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
2015-09-16 23:27:38 +02:00
Tim Daubenschütz cd49a9c402 Create generic links in nav using routes 2015-08-25 16:33:26 +02:00
diminator 5b2ab6c1e2 bug fix acls
otherdata frontend

MIGRATE + loaddate whitelabel
2015-08-20 11:32:11 +02:00
diminator 7e9e187c18 bug fix breadcrumbs
bug fix sluice landing page
bug fix sluice register_piece
bug fix ownershiphistory pending
2015-08-19 17:18:32 +02:00
diminator b1703b6284 cyland landing 2015-08-19 14:48:22 +02:00
diminator f77f1d1d5d cyland submit button and form WIP
cyland footers
2015-08-18 09:42:28 +02:00
diminator fc82c866fb cyland refactor
whitelabel + cyland app
2015-08-17 20:52:36 +02:00
Tim Daubenschütz 88423e6757 fix scroll overflow 2015-08-12 16:26:24 +02:00
Tim Daubenschütz ac45283968 first iteration: whitelabel pages depending on customer 2015-08-11 17:40:26 +02:00
Tim Daubenschütz eb6e3cb20a finishing boilerplate for wallet app + prefixing whitelabel specific files 2015-08-11 14:47:28 +02:00