1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
onion/js/components
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
..
ascribe_accordion_list Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_buttons Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_collapsible set collapsible default show=true 2015-09-25 15:33:01 +02:00
ascribe_detail Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_forms Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_media Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading 2015-09-14 11:14:02 +02:00
ascribe_modal remove close button from modals 2015-08-05 18:00:44 +02:00
ascribe_pagination Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_panel finalize contract styles 2015-09-08 10:15:26 +02:00
ascribe_piece_list_bulk_modal Add fetchPieceList to PieceListBulkModal 2015-09-29 15:23:57 +02:00
ascribe_piece_list_toolbar Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_routes/proxy_routes Refactor AuthProxyHandler 2015-10-12 17:57:23 +02:00
ascribe_settings Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_slides_container Better robustness for slides container and register form for cyland 2015-10-14 16:20:51 +02:00
ascribe_table Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
ascribe_uploader Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
whitelabel Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
acl_proxy.js fix PR comments 2015-09-15 13:22:52 +02:00
ascribe_app.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
ascribe_spinner.js glyphs, spinner, piece list/edition table 2015-10-09 16:21:26 +02:00
coa_verify_container.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
contract_notification.js contract agreement notifications 2015-09-04 11:49:55 +02:00
error_not_found_page.js Add getLangText to ErrorNotFoundPage 2015-09-30 11:06:42 +02:00
footer.js collection page + footer 2015-10-08 20:26:29 +02:00
global_action.js notifications unoptimized 2015-09-01 14:45:14 +02:00
global_notification.js better error messages for API failures 2015-07-17 16:12:24 +02:00
header_notification_debug.js add desktop version for notifications 2015-07-08 17:06:53 +02:00
header_notification.js fix wrong redirect in header_notification 2015-10-12 14:24:21 +02:00
header.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
login_container.js Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
logout_container.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
nav_routes_links_link.js Upgrade react-router-bootstrap 2015-10-01 14:00:56 +02:00
nav_routes_links.js Fix dynamic routing for react-router-bootstrap 2015-10-01 14:16:20 +02:00
password_reset_container.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
piece_list_filter_display.js PR Feeback: Simplify statements 2015-09-17 13:52:51 +02:00
piece_list.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-19 10:30:14 +02:00
register_piece.js Refactor redirect and redirectAuthenticated 2015-10-09 13:51:21 +02:00
search_bar.js bug fix for going to a piece when in a search 2015-10-13 17:30:49 +02:00
signup_container.js Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00