Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ...

Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss

2015-10-22 13:38:49 +02:00

..

ascribe_accordion_list

Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh

2015-10-22 13:38:49 +02:00

ascribe_buttons

Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh

2015-10-22 13:38:49 +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-538-users-and-even-devs-are-unsure-wh

2015-10-22 13:38:49 +02:00

ascribe_forms

Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh

2015-10-22 13:38:49 +02:00

ascribe_media

Add fall back if client cannot load 3rd party libs

2015-10-20 14:16:49 +02:00

ascribe_modal

Further cleanup

2015-10-20 15:10:18 +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-21 09:47: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

Fix buttons for cc

2015-10-21 14:52:25 +02:00

whitelabel

Handle deletion method for WalletPieceContainer

2015-10-21 23:45:53 +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-21 09:47: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

Merged in AD-1080-restyle-webapp-with-new-corporate-identity (pull request #104)

2015-10-22 11:55:34 +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-538-users-and-even-devs-are-unsure-wh

2015-10-22 13:38:49 +02:00

login_container.js

Add document title management for the ascribe app

2015-10-13 16:42:40 +02:00

logout_container.js

Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity

2015-10-21 09:47: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-21 09:47: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-21 09:47:14 +02:00

register_piece.js

Add document title management for the ascribe app

2015-10-13 16:42:40 +02:00

search_bar.js

Replace ascribe-green-color with new ascribe-blue-color

2015-10-21 11:34:12 +02:00

signup_container.js

Add document title management for the ascribe app

2015-10-13 16:42:40 +02:00