Index: app/helpers/queries_helper.rb =================================================================== --- app/helpers/queries_helper.rb (revision 1290) +++ app/helpers/queries_helper.rb (revision 1303) @@ -23,7 +23,7 @@ end def filters_options(query) - options = [[]] + options = [[' '.html_safe, ""]] options += query.available_filters.map do |field, field_options| [field_options[:name], field] end Index: app/helpers/application_helper.rb =================================================================== --- app/helpers/application_helper.rb (revision 1290) +++ app/helpers/application_helper.rb (revision 1303) @@ -380,7 +380,7 @@ if @project link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time)) else - content_tag('acronym', text, :title => format_time(time)) + content_tag('abbr', text, :title => format_time(time)) end end Property changes on: app/models ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/app/models:r1255-1262 Property changes on: app/controllers/groups_controller.rb ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/app/controllers/groups_controller.rb:r1255-1262 Index: app/views/users/_mail_notifications.html.erb =================================================================== --- app/views/users/_mail_notifications.html.erb (revision 1290) +++ app/views/users/_mail_notifications.html.erb (revision 1303) @@ -12,8 +12,9 @@ content_tag('label', check_box_tag( 'notified_project_ids[]', - project.id, - @user.notified_projects_ids.include?(project.id) + project.id, + @user.notified_projects_ids.include?(project.id), + :id => "notified_project_ids_#{project.id}" ) + ' ' + h(project.name) ) end %> Index: app/views/issues/index.html.erb =================================================================== --- app/views/issues/index.html.erb (revision 1290) +++ app/views/issues/index.html.erb (revision 1303) @@ -30,7 +30,7 @@ <%= select_tag('group_by', options_for_select( - [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, + [[' '.html_safe, ""]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by) ) %> Property changes on: app ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/app:r1255-1262