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

Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss

2015-10-15 10:06:39 +02:00

..

ascribe_accordion_list

bug in the collection list handled

2015-10-09 14:38:18 +02:00

ascribe_buttons

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

2015-10-15 10:06:39 +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-15 10:06:39 +02:00

ascribe_forms

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

2015-10-15 10:06:39 +02:00

ascribe_information

acl information render refactored

2015-10-14 13:30:51 +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

acl information render refactored

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

ascribe_pagination

Fix pagination on search bug

2015-06-16 09:27:04 +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

li instead of menuitem

2015-09-29 14:13:15 +02:00

ascribe_settings

Implement AclProxy for hash work in account settings

2015-09-28 12:00:13 +02:00

ascribe_slides_container

bug fix signup query

2015-09-16 23:27:38 +02:00

ascribe_table

refactored notifications per detail

2015-09-03 17:25:22 +02:00

ascribe_uploader

PR Feedback: remove unnecessary DnD functions

2015-09-16 15:52:54 +02:00

whitelabel

Merged in AD-972-remove-50mb-limit-in-additional-f (pull request #98)

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

acl_proxy.js

fix PR comments

2015-09-15 13:22:52 +02:00

ascribe_app.js

add router/navigation integration into whole project

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

coa_verify_container.js

refactor input textarea to use disabled instead of editable

2015-09-21 12:05:42 +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

Fix trailing slash on footer

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

refactored notifications per detail

2015-09-03 17:25:22 +02:00

header.js

qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh

2015-09-30 10:53:16 +02:00

login_container.js

slide container works now with browser history

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

logout_container.js

Separate dispatcher logic of whitelabel and user stores

2015-10-07 09:31:38 +02:00

nav_routes_links_link.js

add documentation for nav routes links

2015-09-08 14:26:56 +02:00

nav_routes_links.js

Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan-

2015-09-10 18:54:25 +02:00

password_reset_container.js

loan contract form

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

piece_list_filter_display.js

PR Feeback: Simplify statements

2015-09-17 13:52:51 +02:00

piece_list.js

removed console log

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

register_piece.js

fix scroll overflow

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

signup_container.js

Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields

2015-09-21 10:21:44 +02:00