<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>public/images/tuneup/arrows.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/edit.png</filename>
    </added>
    <added>
      <filename>public/images/tuneup/fade.png</filename>
    </added>
    <added>
      <filename>public/images/tuneup/fade_down.png</filename>
    </added>
    <added>
      <filename>public/images/tuneup/head.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/logo.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/logo_clear.png</filename>
    </added>
    <added>
      <filename>public/images/tuneup/magnify.png</filename>
    </added>
    <added>
      <filename>public/images/tuneup/pip.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/pointer.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/schema.png</filename>
    </added>
    <added>
      <filename>public/images/tuneup/signin.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/spinner.gif</filename>
    </added>
    <added>
      <filename>public/images/tuneup/warning.gif</filename>
    </added>
    <added>
      <filename>public/javascripts/tuneup/init.js</filename>
    </added>
    <added>
      <filename>public/javascripts/tuneup/prototype.js</filename>
    </added>
    <added>
      <filename>public/javascripts/tuneup/tuneup.js</filename>
    </added>
    <added>
      <filename>public/stylesheets/tuneup/tuneup.css</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -23,7 +23,7 @@ How to install these will differ on each platform. Some possibilities:
 
 ==== FreeBSD
 
-  portinstall ruby18-gems ruby18-mysql rubygem-rake ImageMagick
+  portinstall ruby-iconv ruby18-gems ruby18-mysql rubygem-rake ImageMagick
 
 ==== OSX
 
@@ -52,10 +52,12 @@ Naturally you'll want to be running Apache httpd and have an appropriate virtual
 
 There are a few Ruby gems which are needed for running CIT. Change directory into the top of your CIT installation, then type:
 
-  rake gems
+  rake gems:install
 
-That will tell you what you need to install and help you install them.
+That will install the gems you need.
 
+If you have trouble on OSX with the mysql gem (this seems to be an issue on 10.5 and 10.6), then try this
+  sudo env ARCHFLAGS=&quot;-arch i386&quot; gem install mysql -- --with-mysql-include=/opt/local/include/mysql5 --with-mysql-lib=/opt/local/lib/mysql5 --with-mysql-config=/opt/local/lib/mysql5/bin/mysql_config
 
 
 </diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -2,6 +2,24 @@ Clocking IT change history for new functionality and major bug fixes.
 
 For comprehensive details of every change, please consult http://github.com/ari/clockingit/commits/
 
+26 June 2009
+	Incoming emails with no task number are now dropped into a default project set in the company settings view.
+
+24 June 2009
+    Now all URLs reference the task number and not an internal task ID which should not be visible to the user.
+
+17 June 2009
+	Many database constraints and indexes have been added. This will improve speed and also ensure database integrity. Care should be taken when applying these updates to ensure you don't have existing bad data which prevents the constraints from being added.
+	
+16 June 2009
+	Some fixes implemented to allow postgresql to be used.
+
+10 June 2009
+	Rework entire filter section on reports page to bring it more into alignment with the filter for tasks. This means that your previous filter state is preserved when moving from tasks to reports.
+	
+3 June 2009
+	Work logs now can have custom attributes.
+
 1 June 2009
 	Exception emails are now sent to the system admin. This makes it much easier to diagnose problems. In order to use this feature, please add these two lines to the bottom of environment.local.rb
 	ExceptionNotifier.exception_recipients = [ &quot;email@example.com&quot; ]</diff>
      <filename>RELEASE-NOTES</filename>
    </modified>
    <modified>
      <diff>@@ -16,15 +16,6 @@
 	  &lt;%= javascript_include_tag &quot;flotr&quot; %&gt;
 	&lt;% end %&gt;
 	&lt;%= yield :tinymce_init %&gt;
-
-	&lt;!--[if lt IE 7]&gt;
-	  &lt;%= javascript_include_tag &quot;IE7&quot; %&gt;
-&lt;style type=&quot;text/css&quot;&gt;
-#presence {
-	  position:relative;
-}
-&lt;/style&gt;
-	&lt;![endif]--&gt;
 	&lt;%= stylesheet_link_tag &quot;print&quot;, { :media =&gt; &quot;print&quot; } %&gt;
 	&lt;%= auto_discovery_link_tag(:rss, {:controller =&gt; 'feeds', :action =&gt; 'rss', :id =&gt; current_user.uuid }) %&gt;
 
@@ -112,7 +103,7 @@
 		&lt;/div&gt;
 	&lt;/div&gt;
 	&lt;% else %&gt;
-	&lt;div id=&quot;contact&quot; style=&quot;padding-left:0.3em;padding-top:1em;&quot;&gt;&lt;small&gt;&lt;em&gt;Clocking IT&lt;% if current_user.locale != 'en_US' %&gt; - &lt;a href=&quot;/locales/list&quot;&gt;&lt;%= _'Help Translate'%&gt;&lt;/a&gt;&lt;% end %&gt;&lt;br /&gt;&lt;a href=&quot;mailto:feedback@clockingit.com&quot;&gt;&lt;%=_ 'Feedback? Suggestions? Ideas? Bugs?'%&gt;&lt;/a&gt;&lt;%= link_to &quot;[Admin]&quot;, :controller =&gt; &quot;admin&quot;, :action =&gt; &quot;index&quot; if current_user.admin == 10 %&gt;&lt;/em&gt;&lt;/small&gt;&lt;/div&gt;
+	&lt;div id=&quot;contact&quot;&gt;&lt;% if current_user.locale != 'en_US' %&gt; - &lt;a href=&quot;/locales/list&quot;&gt;&lt;%= _'Help Translate'%&gt;&lt;/a&gt;&lt;% end %&gt;&lt;%= link_to &quot;[Admin]&quot;, :controller =&gt; &quot;admin&quot;, :action =&gt; &quot;index&quot; if current_user.admin == 10 %&gt;&lt;/div&gt;
 	&lt;% end %&gt;
 
 &lt;%= periodically_call_remote(:url =&gt; { :controller =&gt; 'tasks', :action =&gt; 'update_sheet_info' }, :frequency =&gt; 90 ) -%&gt;</diff>
      <filename>app/views/layouts/application.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -1,10 +1,9 @@
 ............................................
 
-This task &lt;%= @task.id %&gt; was just updated with the information above. If you have any further comments to make, please reply to this email above the line.
+This task &lt;%= @task.task_num %&gt; was just updated with the information above. If you have any further comments to make, please reply to this email above the line.
 
 To see the history of this task, visit:
 &lt;%= @user.company.site_URL%&gt;/tasks/view/&lt;%=@task.task_num%&gt;
 
-Sent to &lt;%= &quot;#{@user.name} &lt;#{@user.email}&gt;&quot; %&gt;
 --------------------&gt;
 &lt;%= $CONFIG[:productName] %&gt;
\ No newline at end of file</diff>
      <filename>app/views/notifications/_task_footer.erb</filename>
    </modified>
    <modified>
      <diff>@@ -2,6 +2,5 @@
 
 http://&lt;%= @user.company.subdomain%&gt;.&lt;%= $CONFIG[:domain] %&gt;/shout/room/&lt;%= @room.id %&gt;
 
-Sent to &lt;%= &quot;${@user.name} &lt;${@user.email}&gt;&quot; %&gt;
 --------------------&gt;
 &lt;%= $CONFIG[:productName] %&gt;
\ No newline at end of file</diff>
      <filename>app/views/notifications/chat_invitation.erb</filename>
    </modified>
    <modified>
      <diff>@@ -5,6 +5,6 @@
 &lt;% unless @post.forum.company_id.nil? -%&gt;
 http://&lt;%= @user.company.subdomain%&gt;.&lt;%= $CONFIG[:domain] %&gt;/forums/&lt;%= @post.forum.id %&gt;/topics/&lt;%= @post.topic.id %&gt;#posts-&lt;%= @post.id %&gt;
 &lt;% end -%&gt;
-Sent to &lt;%= &quot;${@user.name} &lt;${@user.email}&gt;&quot; %&gt;
+
 --------------------&gt;
 &lt;%= $CONFIG[:productName] %&gt;
\ No newline at end of file</diff>
      <filename>app/views/notifications/forum_post.erb</filename>
    </modified>
    <modified>
      <diff>@@ -5,6 +5,6 @@
 &lt;% unless @post.forum.company_id.nil? -%&gt;
 http://&lt;%= @user.company.subdomain%&gt;.&lt;%= $CONFIG[:domain] %&gt;/forums/&lt;%= @post.forum.id %&gt;/topics/&lt;%= @post.topic.id %&gt;#posts-&lt;%= @post.id %&gt;
 &lt;% end -%&gt;
-Sent to &lt;%= &quot;${@user.name} &lt;${@user.email}&gt;&quot; %&gt;
+
 --------------------&gt;
 &lt;%= $CONFIG[:productName] %&gt;
\ No newline at end of file</diff>
      <filename>app/views/notifications/forum_reply.erb</filename>
    </modified>
    <modified>
      <diff>@@ -9,6 +9,6 @@
 &lt;% unless @action == 'deleted' -%&gt;
 http://&lt;%= @user.company.subdomain%&gt;.&lt;%= $CONFIG[:domain] %&gt;/views/select_milestone/&lt;%= @milestone.id %&gt;
 &lt;% end -%&gt;
-Sent to &lt;%= &quot;${@user.name} &lt;${@user.email}&gt;&quot; %&gt;
+
 --------------------&gt;
 &lt;%= $CONFIG[:productName] %&gt;
\ No newline at end of file</diff>
      <filename>app/views/notifications/milestone_changed.erb</filename>
    </modified>
    <modified>
      <diff>@@ -25,6 +25,6 @@ Overdue Tasks:
 http://&lt;%= @user.company.subdomain%&gt;.&lt;%= $CONFIG[:domain] %&gt;/tasks/view/&lt;%=t.task_num%&gt;
 &lt;% end %&gt;
 &lt;% end %&gt;
-Sent to &lt;%= &quot;${@user.name} &lt;${@user.email}&gt;&quot; %&gt;
+
 --------------------&gt;
 &lt;%= $CONFIG[:productName] %&gt;
\ No newline at end of file</diff>
      <filename>app/views/notifications/reminder.erb</filename>
    </modified>
    <modified>
      <diff>@@ -29,7 +29,7 @@ class=&quot;task &lt;%=classes%&gt;&quot; style=&quot;position:relative; &lt;%= color_style(task) %&gt; &lt;%
 &lt;% @task = task %&gt;
 &lt;div id=&quot;row-&lt;%=task.dom_id%&gt;&quot; class=&quot;task-row&quot; style=&quot;width:100%;&quot;&gt;
   &lt;% if current_user.show_type_icons? %&gt;
-    &lt;div style=&quot;float:left;padding-top:1px;padding-right:2px;padding-left:2px;&quot; class=&quot;task-icon&quot;&gt;&lt;%= task_icon(task) %&gt;&lt;/div&gt;
+    &lt;div class=&quot;task-icon&quot;&gt;&lt;%= task_icon(task) %&gt;&lt;/div&gt;
   &lt;% end %&gt;
 
   &lt;% if(@current_sheet &amp;&amp; @current_sheet.task_id == task.id) || task.done? -%&gt;
@@ -74,14 +74,6 @@ class=&quot;task &lt;%=classes%&gt;&quot; style=&quot;position:relative; &lt;%= color_style(task) %&gt; &lt;%
 
   &lt;div id=&quot;task-handle-&lt;%=task.id%&gt;&quot; style=&quot;float:left; padding-left:0.4em;display:none;&quot; class=&quot;handle&quot;&gt;&lt;%= image_tag('drag.gif', :border =&gt; 0) %&gt;&lt;/div&gt;
   &lt;div style=&quot;float:left; padding-left:0.3em;&quot;&gt;
-    &lt;% unless task.done? %&gt;
-      &lt;%= check_box(&quot;task&quot;, &quot;done&quot;, { &quot;title&quot; =&gt; _(&quot;Close &lt;b&gt;%s&lt;/b&gt;&quot;, task.name), &quot;onclick&quot; =&gt; &quot;new Ajax.Request('/tasks/ajax_check/#{task.id}', {asynchronous:true, evalScripts:true, onComplete:function(request){hideProgress();}, onLoading:function(request){showProgress();}})&quot;,
-	  :class =&gt; &quot;button tooltip checkbox&quot;, :id =&gt; &quot;button_#{task.id}&quot; }.merge(can_complete) ) -%&gt;
-    &lt;% else %&gt;
-      &lt;%= check_box(&quot;task&quot;, &quot;done&quot;, {&quot;title&quot; =&gt; _(&quot;Revert &lt;b&gt;%s&lt;/b&gt; to not completed status.&quot;, task.name), &quot;onclick&quot; =&gt; &quot;new Ajax.Request('/tasks/ajax_uncheck/#{task.id}', {asynchronous:true, evalScripts:true, onComplete:function(request){hideProgress();}, onLoading:function(request){showProgress();}})&quot;,
-		      :class =&gt; &quot;button tooltip checkbox&quot;, :checked =&gt; &quot;checked&quot;, :id =&gt; &quot;button_#{task.id}&quot; }.merge(can_complete) ) -%&gt;
-    &lt;% end %&gt;
-
     &lt;% if current_user.option_tracktime.to_i == 1 &amp;&amp; can_work.size == 0 -%&gt;
       &lt;% if @current_sheet &amp;&amp; @current_sheet.task_id == task.id -%&gt;
         &lt;%= link_to(image_tag(&quot;time_add.png&quot;, :border =&gt; 0, :class =&gt; &quot;tooltip work_icon&quot;, :title =&gt; _(&quot;Stop working on &lt;b&gt;%s&lt;/b&gt;.&quot;, task.name)), {:controller =&gt; 'tasks', :action =&gt; 'stop_work'}, { :class =&gt; &quot;stop-work-link work-icon&quot; } )  -%&gt;
@@ -93,7 +85,7 @@ class=&quot;task &lt;%=classes%&gt;&quot; style=&quot;position:relative; &lt;%= color_style(task) %&gt; &lt;%
    &lt;% end -%&gt;
    &lt;/div&gt;
   &lt;div class=&quot;unread_icon&quot;&gt;
-  	&lt;a href=&quot;#&quot; onclick=&quot;toggleTaskUnread(this); return false;&quot;&gt;&lt;span&gt;*&lt;/span&gt;&lt;/a&gt;
+  	&lt;a href=&quot;#&quot; onclick=&quot;toggleTaskUnread(this);&quot;&gt;&lt;span&gt;*&lt;/span&gt;&lt;/a&gt;
   &lt;/div&gt;
 
    &lt;div style=&quot;float:right;&quot; class=&quot;avatar&quot;&gt;&lt;%= avatar_for task.users.first, 25 unless task.users.empty? %&gt;&lt;/div&gt;</diff>
      <filename>app/views/tasks/_task_row.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -54,16 +54,10 @@ Rails::Initializer.run do |config|
   # Rotate logs when they reach 1Mb and keep 5 old logs
   config.logger = Logger.new(config.log_path, 5, 1024*1024)
   
-  config.gem 'rails', :version =&gt; '2.3.2'
-  config.gem 'actionpack', :version =&gt; '2.3.2'
-  config.gem 'actionmailer', :version =&gt; '2.3.2'
-  config.gem 'activerecord', :version =&gt; '2.3.2'
-  config.gem 'activeresource', :version =&gt; '2.3.2'
-  config.gem 'activesupport', :version =&gt; '2.3.2'
-  
+
   config.gem 'splattael-activerecord_base_without_table', :lib =&gt; 'activerecord_base_without_table', :source =&gt; 'http://gems.github.com'
         
-  config.gem 'mysql', :version =&gt; '2.7'
+  config.gem 'mysql'
   config.gem 'daemons', :version =&gt; '1.0.10'
   config.gem 'eventmachine', :version =&gt; '0.12.6'
   config.gem 'json', :version =&gt; '1.1.4'
@@ -74,18 +68,17 @@ Rails::Initializer.run do |config|
   config.gem 'icalendar', :version =&gt; '1.1.0'
   config.gem 'tzinfo'
   config.gem 'RedCloth', :version =&gt; '4.1.9'
-  config.gem 'rmagick', :version =&gt; '2.9.1', :lib =&gt; 'RMagick'
+  config.gem 'rmagick', :lib =&gt; 'RMagick'
   config.gem 'ZenTest', :version =&gt; '4.0.0', :lib =&gt; 'zentest'
-  #config.gem 'hoe', :version =&gt; '1.12.1'
   config.gem 'gchartrb', :version =&gt; '0.8', :lib =&gt; 'google_chart'
-  #config.gem 'echoe', :version =&gt; '3.1.1'
   config.gem &quot;thoughtbot-shoulda&quot;, :lib =&gt; &quot;shoulda&quot;, :source =&gt; &quot;http://gems.github.com&quot;
   
   # Juggernaut is installed as a plugin and heavily customised, therefore it cannot be listed here.
   
   # Required for development only
-  config.gem 'allison', :version =&gt; '2.0.3'
-  config.gem 'markaby', :version =&gt; '0.5'
+  config.gem 'allison'
+  config.gem 'markaby'
+  config.gem 'fiveruns_tuneup'
 end
 
 ActionController::Base.session_options[:session_expires]= Time.local(2015,&quot;jan&quot;)
@@ -106,4 +99,4 @@ load File.join(File.dirname(__FILE__), 'environment.local.rb')
 require File.join(File.dirname(__FILE__), '../lib/misc.rb')
 
 require_dependency 'tzinfo'
-include TZInfo
+include TZInfo
\ No newline at end of file</diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -14,5 +14,4 @@ config.action_controller.perform_caching             = false
 config.action_view.debug_rjs                         = false
 
 # Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
-
+config.action_mailer.raise_delivery_errors = false
\ No newline at end of file</diff>
      <filename>config/environments/development.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,6 @@
 require 'date'
 require 'lib/localization'
 
-require 'config/environment'
-
 namespace :locale do
 
   desc &quot;Restore translations into database&quot;</diff>
      <filename>lib/tasks/localization.rake</filename>
    </modified>
    <modified>
      <diff>@@ -282,6 +282,10 @@ body, p, ol, ul, td, tr {
 .task-icon img {
     height: 16px;
     width: 16px;
+    float:left;
+    padding-top:1px;
+    padding-right:2px;
+    padding-left:2px;
 }
 
 .invalid {
@@ -836,7 +840,7 @@ pre.auto_generated {
   color: #CCCCCC;
   font-size: 9px;
   padding-top: 1em;
-  padding-left: 2em;
+  padding-left:0.3em;
 }
 
 .contact a {</diff>
      <filename>public/stylesheets/cit.css</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>public/javascripts/IE7.js</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>5d3172bf2031b59b5221d045131ba6af93748540</id>
    </parent>
    <parent>
      <id>6e3308bd100afa107f83e6319b909cd1259a0b0c</id>
    </parent>
  </parents>
  <author>
    <name>Brad Wilson</name>
    <email>brad@lucky-dip.net</email>
  </author>
  <url>http://github.com/ari/clockingit/commit/9023669b1bfacf270a36ab17a0bd0f0ac22e7604</url>
  <id>9023669b1bfacf270a36ab17a0bd0f0ac22e7604</id>
  <committed-date>2009-07-01T01:12:58-07:00</committed-date>
  <authored-date>2009-07-01T01:12:58-07:00</authored-date>
  <message>Merge branch 'master' of git://github.com/ari/clockingit</message>
  <tree>ac1f2d35522b6f681b7e28841137d0fab1292e60</tree>
  <committer>
    <name>Brad Wilson</name>
    <email>brad@lucky-dip.net</email>
  </committer>
</commit>
