Merge branch 'develop' of github.com:martini/zammad into develop

2015-09-29 07:55:11 +02:00 · 2015-09-29 07:55:11 +02:00 · e190f278fc
commit e190f278fc
parent 72919122cb 7df285d9df
182 changed files with 3 additions and 3 deletions
--- a/app/assets/javascripts/app/config.js.coffee
+++ b/app/assets/javascripts/app/config.js.coffee
--- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
--- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
--- a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
--- a/app/assets/javascripts/app/controllers/_channel/chat.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/chat.js.coffee
--- a/app/assets/javascripts/app/controllers/_channel/email.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/email.js.coffee
--- a/app/assets/javascripts/app/controllers/_channel/facebook.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/facebook.js.coffee
--- a/app/assets/javascripts/app/controllers/_channel/form.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/form.js.coffee
--- a/app/assets/javascripts/app/controllers/_channel/twitter.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/twitter.js.coffee
--- a/app/assets/javascripts/app/controllers/_channel/web.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/web.js.coffee
--- a/app/assets/javascripts/app/controllers/_click_catcher.js.coffee
+++ b/app/assets/javascripts/app/controllers/_click_catcher.js.coffee
--- a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee
--- a/app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.js.coffee
--- a/app/assets/javascripts/app/controllers/_dashboard/rss.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/rss.js.coffee
--- a/app/assets/javascripts/app/controllers/_dashboard/stats.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/stats.js.coffee
--- a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee
+++ b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/avatar.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/avatar.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/devices.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/devices.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/language.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/language.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/notification.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/notification.js.coffee
--- a/app/assets/javascripts/app/controllers/_profile/password.js.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/password.js.coffee
--- a/app/assets/javascripts/app/controllers/_settings/area.js.coffee
+++ b/app/assets/javascripts/app/controllers/_settings/area.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/active.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/active.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/autocompletion.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/autocompletion.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/boolean.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/boolean.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/business_hours.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/business_hours.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/checkbox.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/checkbox.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/date.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/date.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/datetime.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/datetime.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/datetime_search.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/datetime_search.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/ical_feed.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/ical_feed.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/input.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/input.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/postmaster_match.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/postmaster_match.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/radio.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/radio.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/richtext.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/richtext.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/searchable_select.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/searchable_select.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/select.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/select.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/sla_times.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/sla_times.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/tag.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/tag.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/textarea.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/textarea.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/timezone.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/timezone.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion.js.coffee
--- a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.js.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.js.coffee
--- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
--- a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
--- a/app/assets/javascripts/app/controllers/calendar.js.coffee
+++ b/app/assets/javascripts/app/controllers/calendar.js.coffee
--- a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
+++ b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
--- a/app/assets/javascripts/app/controllers/dashboard.js.coffee
+++ b/app/assets/javascripts/app/controllers/dashboard.js.coffee
--- a/app/assets/javascripts/app/controllers/default_route.js.coffee
+++ b/app/assets/javascripts/app/controllers/default_route.js.coffee
--- a/app/assets/javascripts/app/controllers/getting_started.js.coffee
+++ b/app/assets/javascripts/app/controllers/getting_started.js.coffee
--- a/app/assets/javascripts/app/controllers/groups.js.coffee
+++ b/app/assets/javascripts/app/controllers/groups.js.coffee
--- a/app/assets/javascripts/app/controllers/import.js.coffee
+++ b/app/assets/javascripts/app/controllers/import.js.coffee
--- a/app/assets/javascripts/app/controllers/import_otrs.js.coffee
+++ b/app/assets/javascripts/app/controllers/import_otrs.js.coffee
--- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee
+++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
--- a/app/assets/javascripts/app/controllers/login.js.coffee
+++ b/app/assets/javascripts/app/controllers/login.js.coffee
--- a/app/assets/javascripts/app/controllers/logout.js.coffee
+++ b/app/assets/javascripts/app/controllers/logout.js.coffee
--- a/app/assets/javascripts/app/controllers/maintenance.js.coffee
+++ b/app/assets/javascripts/app/controllers/maintenance.js.coffee
--- a/app/assets/javascripts/app/controllers/manage.js.coffee
+++ b/app/assets/javascripts/app/controllers/manage.js.coffee
--- a/app/assets/javascripts/app/controllers/navigation.js.coffee
+++ b/app/assets/javascripts/app/controllers/navigation.js.coffee
--- a/app/assets/javascripts/app/controllers/network.js.coffee
+++ b/app/assets/javascripts/app/controllers/network.js.coffee
--- a/app/assets/javascripts/app/controllers/object_manager.js.coffee
+++ b/app/assets/javascripts/app/controllers/object_manager.js.coffee
--- a/app/assets/javascripts/app/controllers/organization_history.js.coffee
+++ b/app/assets/javascripts/app/controllers/organization_history.js.coffee
--- a/app/assets/javascripts/app/controllers/organization_profile.js.coffee
+++ b/app/assets/javascripts/app/controllers/organization_profile.js.coffee
--- a/app/assets/javascripts/app/controllers/organizations.js.coffee
+++ b/app/assets/javascripts/app/controllers/organizations.js.coffee
--- a/app/assets/javascripts/app/controllers/overview.js.coffee
+++ b/app/assets/javascripts/app/controllers/overview.js.coffee
--- a/app/assets/javascripts/app/controllers/package.js.coffee
+++ b/app/assets/javascripts/app/controllers/package.js.coffee
--- a/app/assets/javascripts/app/controllers/password_reset.js.coffee
+++ b/app/assets/javascripts/app/controllers/password_reset.js.coffee
--- a/app/assets/javascripts/app/controllers/profile.js.coffee
+++ b/app/assets/javascripts/app/controllers/profile.js.coffee
--- a/app/assets/javascripts/app/controllers/session.js.coffee
+++ b/app/assets/javascripts/app/controllers/session.js.coffee
--- a/app/assets/javascripts/app/controllers/settings.js.coffee
+++ b/app/assets/javascripts/app/controllers/settings.js.coffee
--- a/app/assets/javascripts/app/controllers/signup.js.coffee
+++ b/app/assets/javascripts/app/controllers/signup.js.coffee
--- a/app/assets/javascripts/app/controllers/sla.js.coffee
+++ b/app/assets/javascripts/app/controllers/sla.js.coffee
--- a/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee
+++ b/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee
--- a/app/assets/javascripts/app/controllers/text_module.js.coffee
+++ b/app/assets/javascripts/app/controllers/text_module.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_customer.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_customer.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_history.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_history.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/meta.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/meta.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/overview_navigator.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/overview_navigator.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.js.coffee
--- a/app/assets/javascripts/app/controllers/ticket_zoom/title.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/title.js.coffee
--- a/app/assets/javascripts/app/controllers/translation.js.coffee
+++ b/app/assets/javascripts/app/controllers/translation.js.coffee
--- a/app/assets/javascripts/app/controllers/trigger.js.coffee
+++ b/app/assets/javascripts/app/controllers/trigger.js.coffee
--- a/app/assets/javascripts/app/controllers/user_history.js.coffee
+++ b/app/assets/javascripts/app/controllers/user_history.js.coffee
--- a/app/assets/javascripts/app/controllers/user_profile.js.coffee
+++ b/app/assets/javascripts/app/controllers/user_profile.js.coffee
--- a/app/assets/javascripts/app/controllers/users.js.coffee
+++ b/app/assets/javascripts/app/controllers/users.js.coffee
--- a/Show more
+++ b/Show more