Tim Daubenschütz e42df2bb36 Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh ...

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js

2015-11-16 16:23:23 +01:00

..

ascribe_accordion_list

Replace all occurrences of with momentjs

2015-11-03 10:57:41 +01:00

ascribe_buttons

Remove unused imports from AclButton

2015-11-16 13:49:40 +01:00

ascribe_collapsible

set collapsible default show=true

2015-09-25 15:33:01 +02:00

ascribe_detail

Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-

2015-11-16 15:27:00 +01:00

ascribe_forms

Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-

2015-11-16 15:27:00 +01:00

ascribe_media

Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality

2015-11-11 10:51:45 +01:00

ascribe_modal

Use const for the cloned trigger element

2015-10-30 11:13:32 +01: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

Remove misleading editions prop to pieceOrEditions

2015-11-02 15:19:52 +01:00

ascribe_piece_list_toolbar

Pull DropdownButtons in collection to the right, to make them work also on mobile

2015-10-27 17:34:31 +01:00

ascribe_routes/proxy_routes

Improve DRYness of acl buttons

2015-11-06 15:10:29 +01:00

ascribe_settings

Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-

2015-11-16 15:27:00 +01: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 branch 'master' into AD-812-cannot-reupload-video-without-refresh

2015-11-16 16:23:23 +01:00

whitelabel

Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-

2015-11-16 15:27:00 +01: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

Replace last occurences of ascribe-spool-chunked

2015-10-22 17:17:38 +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

Add appropriate spaces to import statement in header.js

2015-10-28 17:55:44 +01: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

Change input type in PieceListToolbarOrderWidget from "checkbox" to "radio"

2015-10-26 17:12:24 +01:00

register_piece.js

Fix minor bugs for simple_prize app

2015-11-06 15:47:55 +01: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