Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated header.

Browse source
This commit is contained in:
Martin Edenhofer 2014-02-03 20:24:49 +01:00
parent d18ef99f78
commit e5c35021ac
39 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/config.js.coffee
View file

@ -1 +1,2 @@
App.Config.set('api_path', 'api/v1') # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
App.Config.set('api_path', 'api/v1')

2
app/assets/javascripts/app/index.js.coffee
View file

@ -1,3 +1,5 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
#= require_self #= require_self
#= require_tree ./lib/app_init #= require_tree ./lib/app_init

2
app/controllers/activity_stream_controller.rb
View file

@ -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 class ActivityStreamController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/application_controller.rb
View file

@ -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 class ApplicationController < ActionController::Base
# http_basic_authenticate_with :name => "test", :password => "ttt" # http_basic_authenticate_with :name => "test", :password => "ttt"

2
app/controllers/channels_controller.rb
View file

@ -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 class ChannelsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/email_addresses_controller.rb
View file

@ -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 class EmailAddressesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/getting_started_controller.rb
View file

@ -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 class GettingStartedController < ApplicationController

2
app/controllers/groups_controller.rb
View file

@ -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 class GroupsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/init_controller.rb
View file

@ -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 class InitController < ApplicationController

2
app/controllers/links_controller.rb
View file

@ -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 class LinksController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/long_polling_controller.rb
View file

@ -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 class LongPollingController < ApplicationController
skip_filter :session_update skip_filter :session_update

2
app/controllers/network_controller.rb
View file

@ -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 class NetworksController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/organizations_controller.rb
View file

@ -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 class OrganizationsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/overviews_controller.rb
View file

@ -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 class OverviewsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/packages_controller.rb
View file

@ -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 class PackagesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/postmaster_filters_controller.rb
View file

@ -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 class PostmasterFiltersController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/recent_viewed_controller.rb
View file

@ -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 class RecentViewedController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/roles_controller.rb
View file

@ -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 class RolesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/rss_controller.rb
View file

@ -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 class RssController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/search_controller.rb
View file

@ -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 class SearchController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/sessions/collection_base.rb
View file

@ -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 module ExtraCollection
def session( collections, user ) def session( collections, user )

2
app/controllers/sessions/collection_network.rb
View file

@ -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 module ExtraCollection
def session( collections, user ) def session( collections, user )

2
app/controllers/sessions/collection_ticket.rb
View file

@ -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 module ExtraCollection
def session( collections, user ) def session( collections, user )

14
app/controllers/sessions_controller.rb
View file

@ -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 class SessionsController < ApplicationController
@ -40,12 +40,12 @@ class SessionsController < ApplicationController
logon_session_key = nil logon_session_key = nil
if params['logon_session'] if params['logon_session']
logon_session_key = Digest::MD5.hexdigest( rand(999999).to_s + Time.new.to_s ) logon_session_key = Digest::MD5.hexdigest( rand(999999).to_s + Time.new.to_s )
# session = ActiveRecord::SessionStore::Session.create( # session = ActiveRecord::SessionStore::Session.create(
# :session_id => logon_session_key, # :session_id => logon_session_key,
# :data => { # :data => {
# :user_id => user['id'] # :user_id => user['id']
# } # }
# ) # )
end end
# return new session data # return new session data

2
app/controllers/settings_controller.rb
View file

@ -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 class SettingsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/signatures_controller.rb
View file

@ -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 class SignaturesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/slas_controller.rb
View file

@ -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 class SlasController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/tags_controller.rb
View file

@ -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 class TagsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/taskbar_controller.rb
View file

@ -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 class TaskbarController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/templates_controller.rb
View file

@ -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 class TemplatesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/tests_controller.rb
View file

@ -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 class TestsController < ApplicationController

2
app/controllers/text_modules_controller.rb
View file

@ -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 class TextModulesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/ticket_articles_controller.rb
View file

@ -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 class TicketArticlesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/ticket_overviews_controller.rb
View file

@ -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' require 'ticket/overviews'

2
app/controllers/ticket_priorities_controller.rb
View file

@ -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 class TicketPrioritiesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

2
app/controllers/ticket_states_controller.rb
View file

@ -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 class TicketStatesController < ApplicationController
before_filter :authentication_check before_filter :authentication_check

4
app/controllers/tickets_controller.rb
View file

@ -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 class TicketsController < ApplicationController
before_filter :authentication_check before_filter :authentication_check
@ -153,7 +153,7 @@ class TicketsController < ApplicationController
.limit(6) .limit(6)
# get related assets # get related assets
ticket_ids_by_customer = [] ticket_ids_by_customer = []
ticket_list.each {|ticket| ticket_list.each {|ticket|
ticket_ids_by_customer.push ticket.id ticket_ids_by_customer.push ticket.id
assets = ticket.assets(assets) assets = ticket.assets(assets)

4
app/controllers/translations_controller.rb
View file

@ -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 class TranslationsController < ApplicationController
before_filter :authentication_check, :except => [:load] before_filter :authentication_check, :except => [:load]
@ -32,4 +32,4 @@ class TranslationsController < ApplicationController
def destroy def destroy
model_destory_render(Translation, params) model_destory_render(Translation, params)
end end
end end

2
app/controllers/users_controller.rb
View file

@ -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 class UsersController < ApplicationController
before_filter :authentication_check, :except => [:create, :password_reset_send, :password_reset_verify] before_filter :authentication_check, :except => [:create, :password_reset_send, :password_reset_verify]