Tim Daubenschütz f42f4a02f8 Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading ...

Resolve merge conflicts with master for easier PR.

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js

2015-09-14 11:14:02 +02:00

..

ascribe_accordion_list

loan request actions for multiple actions

2015-08-27 13:43:26 +02:00

ascribe_buttons

Remove unused ButtonSubmitOrClose and styles

2015-09-02 17:36:01 +02:00

ascribe_collapsible

refactored piece container and detail

2015-08-11 17:12:12 +02:00

ascribe_detail

replace in keyword with dot notation checking

2015-09-10 14:00:59 +02:00

ascribe_forms

replace in keyword with dot notation checking

2015-09-10 14:00:59 +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

Fix pagination on search bug

2015-06-16 09:27:04 +02:00

ascribe_panel

refactor request action form

2015-08-10 11:57:38 +02:00

ascribe_piece_list_bulk_modal

Filter open edition tables correctly

2015-08-07 13:05:50 +02:00

ascribe_piece_list_toolbar

sorting acl and styling

2015-08-14 15:38:30 +02:00

ascribe_prizes_dashboard

refactor ascribe table and add prizes dashboard boilerplate code

2015-07-29 18:03:49 +02:00

ascribe_slides_container

minor fix

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

ascribe_table

loan request actions for multiple actions

2015-08-27 13:43:26 +02:00

ascribe_uploader

Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading

2015-09-14 11:14:02 +02:00

whitelabel

Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading

2015-09-14 11:14:02 +02:00

acl_proxy.js

Filter open edition tables correctly

2015-08-07 13:05:50 +02:00

ascribe_app.js

add router/navigation integration into whole project

2015-08-27 14:34:15 +02:00

coa_verify_container.js

rename apiUrls to ApiUrls

2015-08-07 15:08:02 +02:00

footer.js

Fix trailing slash on footer

2015-07-21 17:57:11 +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.js

fix nav links on logged out user

2015-08-28 15:31:12 +02:00

login_container.js

slide container works now with browser history

2015-07-21 15:05:42 +02:00

logout_container.js

patch logout behavior

2015-07-17 18:53:04 +02:00

nav_routes_links.js

add router/navigation integration into whole project

2015-08-27 14:34:15 +02:00

password_reset_container.js

loan contract form

2015-08-18 16:24:36 +02:00

piece_list.js

integrate unfilteredPieceListCount into piece list store and list

2015-08-31 16:57:16 +02:00

register_piece.js

fix scroll overflow

2015-08-12 16:26:24 +02:00

settings_container.js

increase otherdata limit to 50MB

2015-08-24 12:11:07 +02:00

signup_container.js

add licences for cc

2015-07-15 11:28:53 +02:00