diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade
--- smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade	2008-06-24 18:33:30.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade	2008-09-29 21:07:48.000000000 -0500
@@ -144,6 +144,18 @@
     $statement->execute or die "execute: $$statement: $DBI::errstr";
 }
 
+unless (defined $nag_shares_groups->{group_uid})
+{
+    # We need to be careful about this one as it will fail if the
+    # column exists, so we check the error.
+    my $statement =
+        "ALTER TABLE nag_shares_groups ADD group_uid VARCHAR(255) ".
+        "NOT NULL";
+    $statement = $db_naghandle->prepare($statement) or
+        die "prepare: $$statement: $DBI::errstr";
+    $statement->execute or die "execute: $$statement: $DBI::errstr";
+}
+
 # Create an index for task_owner if needed
 unless ($nag_tasks->{task_owner}->{Key})
 {
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header	2008-05-13 19:46:58.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header	2008-09-29 21:08:26.000000000 -0500
@@ -1,6 +1,6 @@
 //00Header
 /**
- * $Horde: nag/config/prefs.php.dist,v 1.42.2.8 2008/02/13 19:56:58 chuck Exp $
+ * $Horde: nag/config/prefs.php.dist,v 1.42.2.10 2008/07/02 16:15:45 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display	2008-04-06 19:18:59.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display	2008-09-29 21:15:00.000000000 -0500
@@ -3,6 +3,7 @@
     'column' => _("General Options"),
     'label' => _("Display Options"), 
     'desc' => _("Change your task sorting and display options."),
-    'members' => array('show_tasklist', 'show_panel', 'sortby', 'altsortby', 'sortdir'),
+    'members' => array('tasklist_columns', 'show_panel', 'sortby', 'altsortby',
+                       'sortdir'),
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList	2008-05-13 19:49:36.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/170ShowTaskList	2008-09-29 21:15:38.000000000 -0500
@@ -1,10 +1,15 @@
-//170ShowTaskList
-// show a task list column in the list view?
-$_prefs['show_tasklist'] = array(
-    'value' => 0,
+//170Tasklist_Columns
+// columns in the list view
+$_prefs['tasklist_columns'] = array(
+    'value' => 'a:3:\{i:0;s:8:"priority";i:1;s:3:"due";i:2;s:8:"category";\}',
     'locked' => false,
     'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Should the Task List be shown in its own column in the List view?")
+    'type' => 'multienum',
+    'enum' => array('tasklist' => _("Task List"),
+                    'priority' => _("Priority"),  
+                    'assignee' => _("Assignee"),
+                    'due' => _("Due Date"),
+                    'category' => _("Category")),
+    'desc' => _("Select the columns that should be shown in the list view:")
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy	2008-05-13 19:50:58.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/190SortBy	2008-09-29 21:18:30.000000000 -0500
@@ -10,6 +10,7 @@
                     NAG_SORT_CATEGORY => _("Category"),
                     NAG_SORT_DUE => _("Due Date"),
                     NAG_SORT_COMPLETION => _("Completed?"),
+                    NAG_SORT_ASSIGNEE => _("Assignee"),
                     NAG_SORT_OWNER => _("Task List")),
     'desc' => _("Sort tasks by:"),
 );
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy
--- smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy	2008-05-13 19:51:17.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/200AltSortBy	2008-09-29 21:18:44.000000000 -0500
@@ -10,6 +10,7 @@
                     NAG_SORT_CATEGORY => _("Category"),
                     NAG_SORT_DUE => _("Due Date"),
                     NAG_SORT_COMPLETION => _("Completed?"),
+                    NAG_SORT_ASSIGNEE => _("Assignee"),
                     NAG_SORT_OWNER => _("Task List")),
     'desc' => _("Then:"),
 );
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql
--- smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql	2008-06-18 22:56:48.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql	2008-09-29 21:06:57.000000000 -0500
@@ -37,7 +37,7 @@
 
 CREATE TABLE IF NOT EXISTS nag_shares_groups (
     share_id INT NOT NULL,
-    group_uid INT NOT NULL,
+    group_uid VARCHAR(255) NOT NULL,
     perm SMALLINT NOT NULL
 );