1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-29 00:58:03 +02:00
Commit Graph

17 Commits

Author SHA1 Message Date
Brett Sun
8fce04125f Merge with master 2016-02-08 14:08:54 +01:00
Brett Sun
e5cae3fc34 Update multiline destructuring format based on style guide 2016-01-18 14:46:39 +01:00
Brett Sun
8009174787 Change AccordionListItems and parents for loading UserStore from top level app 2016-01-11 19:06:50 +01:00
Brett Sun
39730ec637 Merge with master 2015-12-23 13:17:08 +01:00
Brett Sun
ce9493e3dd Use the 300x300 thumbnail if available 2015-12-21 14:46:10 +01:00
Brett Sun
c7f272c3a3 Small fixes for DRY and React warnings 2015-12-17 17:31:33 +01:00
Brett Sun
9d02877363 Fix customThumbnailPlacholder propType 2015-12-04 13:52:17 +01:00
Brett Sun
3be033cdd5 Add thumbnail placeholder for 23vivi 2015-12-02 19:31:50 +01:00
Tim Daubenschütz
b2a9eb1c7c Add thumbnail replacement for new logo 2015-10-22 10:39:11 +02: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
f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
Tim Daubenschütz
8cd4377a58 Change links in app to new react-router@1.0rc1 syntax 2015-09-30 18:30:50 +02:00
Tim Daubenschütz
88b525f352 change link in accordionlist item dependent on domain 2015-08-26 15:18:05 +02:00
diminator
fc82c866fb cyland refactor
whitelabel + cyland app
2015-08-17 20:52:36 +02:00
diminator
247cca3ee2 piece rating + navigation OK
close prize
2015-08-13 13:28:09 +02:00
diminator
d5efd79d14 refactored accordion list item:
accordion-list-item
accordion-list-item-piece < accordion-list-item
accordion-list-item-wallet < accordion-list-item-piece
accordion-list-item-prize < accordion-list-item-piece
2015-08-11 12:06:01 +02:00