diff --git a/app/assets/javascripts/app/config.js.coffee b/app/assets/javascripts/app/config.js.coffee index 86c49232d..79afd5792 100644 --- a/app/assets/javascripts/app/config.js.coffee +++ b/app/assets/javascripts/app/config.js.coffee @@ -1 +1,2 @@ -App.Config.set('api_path', 'api/v1') \ No newline at end of file +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ +App.Config.set('api_path', 'api/v1') diff --git a/app/assets/javascripts/app/index.js.coffee b/app/assets/javascripts/app/index.js.coffee index 996cb273c..b12b44d7a 100644 --- a/app/assets/javascripts/app/index.js.coffee +++ b/app/assets/javascripts/app/index.js.coffee @@ -1,3 +1,5 @@ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ + #= require_self #= require_tree ./lib/app_init diff --git a/app/controllers/activity_stream_controller.rb b/app/controllers/activity_stream_controller.rb index 33f01b5b0..4a7c95fdb 100644 --- a/app/controllers/activity_stream_controller.rb +++ b/app/controllers/activity_stream_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class ActivityStreamController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 98ac39e96..fac479dae 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class ApplicationController < ActionController::Base # http_basic_authenticate_with :name => "test", :password => "ttt" diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb index 6e63879fd..88160cdfc 100644 --- a/app/controllers/channels_controller.rb +++ b/app/controllers/channels_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class ChannelsController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/email_addresses_controller.rb b/app/controllers/email_addresses_controller.rb index 1074c3219..d905e71a9 100644 --- a/app/controllers/email_addresses_controller.rb +++ b/app/controllers/email_addresses_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class EmailAddressesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/getting_started_controller.rb b/app/controllers/getting_started_controller.rb index f34678a07..49cefde62 100644 --- a/app/controllers/getting_started_controller.rb +++ b/app/controllers/getting_started_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class GettingStartedController < ApplicationController diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 168d05e51..f3f12a2a9 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class GroupsController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/init_controller.rb b/app/controllers/init_controller.rb index bce59e7a5..2dcafaaf1 100644 --- a/app/controllers/init_controller.rb +++ b/app/controllers/init_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class InitController < ApplicationController diff --git a/app/controllers/links_controller.rb b/app/controllers/links_controller.rb index b73a8fc61..a8921c1f8 100644 --- a/app/controllers/links_controller.rb +++ b/app/controllers/links_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class LinksController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb index 15fe4c774..a4b884a0d 100644 --- a/app/controllers/long_polling_controller.rb +++ b/app/controllers/long_polling_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class LongPollingController < ApplicationController skip_filter :session_update diff --git a/app/controllers/network_controller.rb b/app/controllers/network_controller.rb index 775f5e041..5c39e9d2e 100644 --- a/app/controllers/network_controller.rb +++ b/app/controllers/network_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class NetworksController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index b913e8312..fafb1f393 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class OrganizationsController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/overviews_controller.rb b/app/controllers/overviews_controller.rb index 48650c5eb..6e100f694 100644 --- a/app/controllers/overviews_controller.rb +++ b/app/controllers/overviews_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class OverviewsController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 36511f64e..2fdf0e87a 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class PackagesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/postmaster_filters_controller.rb b/app/controllers/postmaster_filters_controller.rb index dcb23c057..352719074 100644 --- a/app/controllers/postmaster_filters_controller.rb +++ b/app/controllers/postmaster_filters_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class PostmasterFiltersController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/recent_viewed_controller.rb b/app/controllers/recent_viewed_controller.rb index 5112e0f18..1f0e67594 100644 --- a/app/controllers/recent_viewed_controller.rb +++ b/app/controllers/recent_viewed_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class RecentViewedController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index a13b024ff..e74aa74dc 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class RolesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb index 3ec80406f..bf7768b81 100644 --- a/app/controllers/rss_controller.rb +++ b/app/controllers/rss_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class RssController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 1b4413a5d..b30cb0392 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class SearchController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/sessions/collection_base.rb b/app/controllers/sessions/collection_base.rb index 3aea3e3e2..80af0495f 100644 --- a/app/controllers/sessions/collection_base.rb +++ b/app/controllers/sessions/collection_base.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ module ExtraCollection def session( collections, user ) diff --git a/app/controllers/sessions/collection_network.rb b/app/controllers/sessions/collection_network.rb index 5029fd172..2048dc58c 100644 --- a/app/controllers/sessions/collection_network.rb +++ b/app/controllers/sessions/collection_network.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ module ExtraCollection def session( collections, user ) diff --git a/app/controllers/sessions/collection_ticket.rb b/app/controllers/sessions/collection_ticket.rb index 5f62e03d4..b05a02b3f 100644 --- a/app/controllers/sessions/collection_ticket.rb +++ b/app/controllers/sessions/collection_ticket.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ module ExtraCollection def session( collections, user ) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 88a6272b4..1da4ff7a2 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class SessionsController < ApplicationController @@ -40,12 +40,12 @@ class SessionsController < ApplicationController logon_session_key = nil if params['logon_session'] logon_session_key = Digest::MD5.hexdigest( rand(999999).to_s + Time.new.to_s ) -# session = ActiveRecord::SessionStore::Session.create( -# :session_id => logon_session_key, -# :data => { -# :user_id => user['id'] -# } -# ) + # session = ActiveRecord::SessionStore::Session.create( + # :session_id => logon_session_key, + # :data => { + # :user_id => user['id'] + # } + # ) end # return new session data diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 5d60afec3..43ae842fa 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class SettingsController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/signatures_controller.rb b/app/controllers/signatures_controller.rb index 9e77ffc02..65dea3ba0 100644 --- a/app/controllers/signatures_controller.rb +++ b/app/controllers/signatures_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class SignaturesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/slas_controller.rb b/app/controllers/slas_controller.rb index 21fa2803d..46e0b9b36 100644 --- a/app/controllers/slas_controller.rb +++ b/app/controllers/slas_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class SlasController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 1bce89d5c..0629fd2cc 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TagsController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/taskbar_controller.rb b/app/controllers/taskbar_controller.rb index 92e3e53c1..9d0e44667 100644 --- a/app/controllers/taskbar_controller.rb +++ b/app/controllers/taskbar_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TaskbarController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb index 779adbab5..6759c08f9 100644 --- a/app/controllers/templates_controller.rb +++ b/app/controllers/templates_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TemplatesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/tests_controller.rb b/app/controllers/tests_controller.rb index c48260ee5..4310cc601 100644 --- a/app/controllers/tests_controller.rb +++ b/app/controllers/tests_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TestsController < ApplicationController diff --git a/app/controllers/text_modules_controller.rb b/app/controllers/text_modules_controller.rb index 26c43c599..299a4a430 100644 --- a/app/controllers/text_modules_controller.rb +++ b/app/controllers/text_modules_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TextModulesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/ticket_articles_controller.rb b/app/controllers/ticket_articles_controller.rb index 6ba81dcd0..5f351a8a6 100644 --- a/app/controllers/ticket_articles_controller.rb +++ b/app/controllers/ticket_articles_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TicketArticlesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/ticket_overviews_controller.rb b/app/controllers/ticket_overviews_controller.rb index 7a3bc802a..a64abd9b8 100644 --- a/app/controllers/ticket_overviews_controller.rb +++ b/app/controllers/ticket_overviews_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ require 'ticket/overviews' diff --git a/app/controllers/ticket_priorities_controller.rb b/app/controllers/ticket_priorities_controller.rb index fd9dadcd6..fee707f12 100644 --- a/app/controllers/ticket_priorities_controller.rb +++ b/app/controllers/ticket_priorities_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TicketPrioritiesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/ticket_states_controller.rb b/app/controllers/ticket_states_controller.rb index 8ecf55f44..60bf20de8 100644 --- a/app/controllers/ticket_states_controller.rb +++ b/app/controllers/ticket_states_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TicketStatesController < ApplicationController before_filter :authentication_check diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb index e9457e13a..58181d7ce 100644 --- a/app/controllers/tickets_controller.rb +++ b/app/controllers/tickets_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TicketsController < ApplicationController before_filter :authentication_check @@ -153,7 +153,7 @@ class TicketsController < ApplicationController .limit(6) # get related assets - ticket_ids_by_customer = [] + ticket_ids_by_customer = [] ticket_list.each {|ticket| ticket_ids_by_customer.push ticket.id assets = ticket.assets(assets) diff --git a/app/controllers/translations_controller.rb b/app/controllers/translations_controller.rb index b33b0155a..b4b30ad4a 100644 --- a/app/controllers/translations_controller.rb +++ b/app/controllers/translations_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class TranslationsController < ApplicationController before_filter :authentication_check, :except => [:load] @@ -32,4 +32,4 @@ class TranslationsController < ApplicationController def destroy model_destory_render(Translation, params) end -end \ No newline at end of file +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d178d5606..6d4f4c207 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ class UsersController < ApplicationController before_filter :authentication_check, :except => [:create, :password_reset_send, :password_reset_verify]