jro_apps/redmine Commit - r2763:8faa66f68fb2

0

app/models/time_entry.rb +7 -3

               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
               acts_as_customizable
-              acts_as_event :title => Proc.new {|o| "#{o.user}: #{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
+              acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
-                            :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project}},
+                            :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project, :issue_id => o.issue}},
                             :author => :user,
                             :description => :comments
+              acts_as_activity_provider :timestamp => "#{table_name}.created_on",
+                                        :author_key => :user_id,
+                                        :find_options => {:include => :project}
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true

0

config/locales/bg.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/bs.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/ca.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/cs.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/da.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/de.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/el.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/en.yml +1 0

               label_group: Group
               label_group_plural: Groups
               label_group_new: New group
+              label_time_entry_plural: Spent time
               button_login: Login
               button_submit: Submit

0

config/locales/es.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/fi.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/fr.yml +1 0

               label_group_plural: Groupes
               label_group: Groupe
               label_group_new: Nouveau groupe
+              label_time_entry_plural: Temps passé
               button_login: Connexion
               button_submit: Soumettre

0

config/locales/gl.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/he.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/hu.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/it.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/ja.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/ko.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/lt.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/nl.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/no.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/pl.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/pt-BR.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/pt.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/ro.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/ru.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/sk.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/sl.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/sr.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/sv.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/th.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/tr.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/uk.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/vi.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/zh-TW.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

config/locales/zh.yml +1 0

               label_group_plural: Groups
               label_group: Group
               label_group_new: New group
+              label_time_entry_plural: Spent time

0

lib/redmine.rb +1 0

               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
+              activity.register :time_entries, :default => false
             end
             Redmine::WikiFormatting.map do |format|

0

public/stylesheets/application.css +1 0

             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
+            dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages