diminator e862fa39a9 Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra ...

Conflicts:
	web/settings.py

2015-08-18 12:36:38 +02:00

..

ascribe_accordion_list

cyland refactor

2015-08-17 20:52:36 +02:00

ascribe_buttons

refactor: acl buttons message functionality

2015-08-10 15:57:20 +02:00

ascribe_collapsible

refactored piece container and detail

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

ascribe_detail

cyland refactor

2015-08-17 20:52:36 +02:00

ascribe_forms

add functionality to make a forwarded process slide container

2015-08-12 16:11:15 +02:00

ascribe_media

…

ascribe_modal

remove close button from modals

2015-08-05 18:00:44 +02:00

ascribe_pagination

…

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

…

ascribe_slides_container

breadcrumb style fix

2015-08-17 13:46:04 +02:00

ascribe_table

Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-

2015-08-05 14:52:18 +02:00

ascribe_uploader

…

whitelabel

Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra

2015-08-18 12:36:38 +02:00

acl_proxy.js

Filter open edition tables correctly

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

ascribe_app.js

…

coa_verify_container.js

rename apiUrls to ApiUrls

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

footer.js

…

global_notification.js

…

header_notification_debug.js

…

header.js

add functionality to make a forwarded process slide container

2015-08-12 16:11:15 +02:00

login_container.js

…

logout_container.js

…

password_reset_container.js

rename apiUrls to ApiUrls

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

piece_list.js

order by rating

2015-08-14 14:58:23 +02:00

register_piece.js

fix scroll overflow

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

routes.js

…

settings_container.js

Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r'

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

signup_container.js

…