Index: application/models/application_logs/ApplicationLog.class.php
===================================================================
--- application/models/application_logs/ApplicationLog.class.php (revision 104)
+++ application/models/application_logs/ApplicationLog.class.php (working copy)
@@ -96,6 +96,11 @@
*/
function getText() {
$code = strtolower('log ' . ($this->getAction()) . ' ' . $this->getRelObjectManager());
+ if ($relObject instanceof Comment)
+ {
+ $ownerObject = $relObject->getObject();
+ return $ownerObject instanceof ProjectDataObject ? "Re: ".$ownerObject->getObjectName()." - ".substr_utf($relObject->getText(), 0, 50) . '...' : "Re: ".$relObject->getObjectTypeName()."";
+ }
return lang($code, $this->getObjectName());
} // getText
Index: language/en_us/administration.php
===================================================================
--- language/en_us/administration.php (revision 104)
+++ language/en_us/administration.php (working copy)
@@ -32,6 +32,8 @@
'config category desc general' => 'General ProjectPier settings',
'config category name mailing' => 'Mailing',
'config category desc mailing' => 'Use this set of settings to set up how ProjectPier should handle email sending. You can use configuration options provided in your php.ini or set it so it uses any other SMTP server',
+ 'config category name features' => 'Features',
+ 'config category desc features' => 'Use this set of settings to enable/disable different features and choose between different methods of displaying project data',
// ---------------------------------------------------
// Options
@@ -62,7 +64,7 @@
'config option name smtp_username' => 'SMTP username',
'config option name smtp_password' => 'SMTP password',
'config option name smtp_secure_connection' => 'Use secure SMTP connection',
-
+ 'config option name per_project_activity_logs' => 'Per-project activity logs',
); // array
?>
Index: application/helpers/application.php
===================================================================
--- application/helpers/application.php (revision 104)
+++ application/helpers/application.php (working copy)
@@ -460,6 +460,21 @@
} // render_application_logs
/**
+ * Render one project's application logs
+ *
+ * This helper will render array of log entries.
+ *
+ * @param array $project The project.
+ * @param array $log_entries An array of entries for this project.
+ * @return null
+ */
+ function render_project_application_logs($project, $log_entries) {
+ tpl_assign('application_logs_project', $project);
+ tpl_assign('application_logs_entries', $logs);
+ return tpl_fetch(get_template_path('render_project_application_logs', 'application'));
+ } // render_application_logs
+
+ /**
* Render text that says when action was tacken and by who
*
* @param ApplicationLog $application_log_entry
Index: application/controllers/DashboardController.class.php
===================================================================
--- application/controllers/DashboardController.class.php (revision 104)
+++ application/controllers/DashboardController.class.php (working copy)
@@ -34,8 +34,15 @@
$include_silent = $logged_user->isAdministrator();
$project_ids = array();
+ $projects_activity_log = array();
foreach ($active_projects as $active_project) {
$project_ids[] = $active_project->getId();
+ $temp_project_logs = ApplicationLogs::getProjectLogs($active_project,$include_private, $include_silent,config_option('dashboard_project_logs_count',7));
+ if (isset($temp_project_logs) && is_array($temp_project_logs) && count($temp_project_logs))
+ {
+ $projects_activity_log[$temp_project_logs[0]->getCreatedOn()->getTimestamp()] = $temp_project_logs;
+ }
+ krsort($projects_activity_log);
} // if
$activity_log = ApplicationLogs::getOverallLogs($include_private, $include_silent, $project_ids, config_option('dashboard_logs_count', 15));
@@ -45,6 +52,7 @@
tpl_assign('late_milestones', $logged_user->getLateMilestones());
tpl_assign('active_projects', $active_projects);
tpl_assign('activity_log', $activity_log);
+ tpl_assign('projects_activity_log', $projects_activity_log);
// Sidebar
tpl_assign('online_users', Users::getWhoIsOnline());
Index: application/views/dashboard/index.php
===================================================================
--- application/views/dashboard/index.php (revision 104)
+++ application/views/dashboard/index.php (working copy)
@@ -16,7 +16,7 @@
-
getDisplayName(), ROOT_URL) ?>
+
getDisplayName()), ROOT_URL) ?>
isInfoUpdated()) { ?>
@@ -85,8 +85,23 @@
-
- true)) ?>
-
-
-
+getProject(); ?>
+
+ } //if
+ } //foreach $project
+ } else { ?>
+
+} // if
+ } else {
+ if (isset($activity_log) && is_array($activity_log) && count($activity_log)) { ?>
+ true)); ?>
+} else { ?>
+
+} // if
+} //if
+?>
\ No newline at end of file
Index: application/views/application/render_project_application_logs.php
===================================================================
--- application/views/application/render_project_application_logs.php (revision 0)
+++ application/views/application/render_project_application_logs.php (revision 0)
@@ -0,0 +1,37 @@
+
+
+
+
Index: public/install/installation/templates/sql/mysql_initial_data.php
===================================================================
--- public/install/installation/templates/sql/mysql_initial_data.php (revision 104)
+++ public/install/installation/templates/sql/mysql_initial_data.php (working copy)
@@ -1,65 +1,67 @@
-INSERT INTO `administration_tools` (`name`, `controller`, `action`, `order`) VALUES ('test_mail_settings', 'administration', 'tool_test_email', 1);
-INSERT INTO `administration_tools` (`name`, `controller`, `action`, `order`) VALUES ('mass_mailer', 'administration', 'tool_mass_mailer', 2);
-
-INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('system', 1, 0);
-INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('general', 0, 1);
-INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('mailing', 0, 2);
-
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'project_logs_per_page', '10', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'messages_per_page', '5', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_avatar_width', '50', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_avatar_height', '50', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'logs_per_project', '5', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_logo_width', '50', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_logo_height', '50', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'files_per_page', '10', 'IntegerConfigHandler', 1, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'site_name', 'ProjectPier', 'StringConfigHandler', 0, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'upgrade_last_check_datetime', '2006-09-02 13:46:47', 'DateTimeConfigHandler', 1, 0, 'Date and time of the last upgrade check');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'upgrade_last_check_new_version', '0', 'BoolConfigHandler', 1, 0, 'True if system checked for the new version and found it. This value is used to hightligh upgrade tab in the administration');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'upgrade_check_enabled', '1', 'BoolConfigHandler', 0, 0, 'Upgrade check enabled / dissabled');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'file_storage_adapter', 'fs', 'FileStorageConfigHandler', 0, 0, 'What storage adapter should be used? fs or mysql');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'default_project_folders', 'images\r\ndocuments\r\nother\r\n', 'TextConfigHandler', 0, 3, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'theme', 'default', 'ThemeConfigHandler', 0, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'exchange_compatible', '0', 'BoolConfigHandler', 0, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'mail_transport', 'mail()', 'MailTransportConfigHandler', 0, 0, 'Values: ''mail()'' - try to emulate mail() function, ''smtp'' - use SMTP connection');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_server', '', 'StringConfigHandler', 0, 0, '');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_port', '25', 'IntegerConfigHandler', 0, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_authenticate', '0', 'BoolConfigHandler', 0, 0, 'Use SMTP authentication');
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_username', '', 'StringConfigHandler', 0, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_password', '', 'PasswordConfigHandler', 0, 0, NULL);
-INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_secure_connection', 'no', 'SecureSmtpConnectionConfigHandler', 0, 0, 'Values: no, ssl, tls');
-
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('zip', 'archive.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('rar', 'archive.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('bz', 'archive.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('bz2', 'archive.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('gz', 'archive.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('ace', 'archive.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mp3', 'audio.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('wma', 'audio.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('ogg', 'audio.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('doc', 'doc.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('xsl', 'doc.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('gif', 'image.png', 0, 1);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('jpg', 'image.png', 0, 1);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('jpeg', 'image.png', 0, 1);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('png', 'image.png', 0, 1);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mov', 'mov.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('pdf', 'pdf.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('psd', 'psd.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('rm', 'rm.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('svg', 'svg.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('swf', 'swf.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('avi', 'video.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mpeg', 'video.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mpg', 'video.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('qt', 'mov.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('vob', 'video.png', 0, 0);
-INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('txt', 'doc.png', 1, 0);
-
-INSERT INTO `im_types` (`name`, `icon`) VALUES ('ICQ', 'icq.gif');
-INSERT INTO `im_types` (`name`, `icon`) VALUES ('AIM', 'aim.gif');
-INSERT INTO `im_types` (`name`, `icon`) VALUES ('MSN', 'msn.gif');
-INSERT INTO `im_types` (`name`, `icon`) VALUES ('Yahoo!', 'yahoo.gif');
-INSERT INTO `im_types` (`name`, `icon`) VALUES ('Skype', 'skype.gif');
-INSERT INTO `im_types` (`name`, `icon`) VALUES ('Jabber', 'jabber.gif');
+INSERT INTO `administration_tools` (`name`, `controller`, `action`, `order`) VALUES ('test_mail_settings', 'administration', 'tool_test_email', 1);
+INSERT INTO `administration_tools` (`name`, `controller`, `action`, `order`) VALUES ('mass_mailer', 'administration', 'tool_mass_mailer', 2);
+
+INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('system', 1, 0);
+INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('general', 0, 1);
+INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('mailing', 0, 2);
+INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('features', 0, 3);
+
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'project_logs_per_page', '10', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'messages_per_page', '5', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_avatar_width', '50', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_avatar_height', '50', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'logs_per_project', '5', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_logo_width', '50', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'max_logo_height', '50', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'files_per_page', '10', 'IntegerConfigHandler', 1, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'site_name', 'ProjectPier', 'StringConfigHandler', 0, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'upgrade_last_check_datetime', '2006-09-02 13:46:47', 'DateTimeConfigHandler', 1, 0, 'Date and time of the last upgrade check');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'upgrade_last_check_new_version', '0', 'BoolConfigHandler', 1, 0, 'True if system checked for the new version and found it. This value is used to hightligh upgrade tab in the administration');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'upgrade_check_enabled', '1', 'BoolConfigHandler', 0, 0, 'Upgrade check enabled / dissabled');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'file_storage_adapter', 'fs', 'FileStorageConfigHandler', 0, 0, 'What storage adapter should be used? fs or mysql');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'default_project_folders', 'images\r\ndocuments\r\nother\r\n', 'TextConfigHandler', 0, 3, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'theme', 'default', 'ThemeConfigHandler', 0, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'exchange_compatible', '0', 'BoolConfigHandler', 0, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'mail_transport', 'mail()', 'MailTransportConfigHandler', 0, 0, 'Values: ''mail()'' - try to emulate mail() function, ''smtp'' - use SMTP connection');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_server', '', 'StringConfigHandler', 0, 0, '');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_port', '25', 'IntegerConfigHandler', 0, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_authenticate', '0', 'BoolConfigHandler', 0, 0, 'Use SMTP authentication');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_username', '', 'StringConfigHandler', 0, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_password', '', 'PasswordConfigHandler', 0, 0, NULL);
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_secure_connection', 'no', 'SecureSmtpConnectionConfigHandler', 0, 0, 'Values: no, ssl, tls');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('features', 'per_project_activity_logs', '0', 'BoolConfigHandler', 0, 0, 'Show recent activity logs per project on the owner company dashboard (like BaseCamp) rather than all mashed together');
+
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('zip', 'archive.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('rar', 'archive.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('bz', 'archive.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('bz2', 'archive.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('gz', 'archive.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('ace', 'archive.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mp3', 'audio.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('wma', 'audio.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('ogg', 'audio.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('doc', 'doc.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('xsl', 'doc.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('gif', 'image.png', 0, 1);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('jpg', 'image.png', 0, 1);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('jpeg', 'image.png', 0, 1);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('png', 'image.png', 0, 1);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mov', 'mov.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('pdf', 'pdf.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('psd', 'psd.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('rm', 'rm.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('svg', 'svg.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('swf', 'swf.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('avi', 'video.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mpeg', 'video.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('mpg', 'video.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('qt', 'mov.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('vob', 'video.png', 0, 0);
+INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('txt', 'doc.png', 1, 0);
+
+INSERT INTO `im_types` (`name`, `icon`) VALUES ('ICQ', 'icq.gif');
+INSERT INTO `im_types` (`name`, `icon`) VALUES ('AIM', 'aim.gif');
+INSERT INTO `im_types` (`name`, `icon`) VALUES ('MSN', 'msn.gif');
+INSERT INTO `im_types` (`name`, `icon`) VALUES ('Yahoo!', 'yahoo.gif');
+INSERT INTO `im_types` (`name`, `icon`) VALUES ('Skype', 'skype.gif');
+INSERT INTO `im_types` (`name`, `icon`) VALUES ('Jabber', 'jabber.gif');
\ No newline at end of file
Index: public/install/installation/templates/sql/mysql_initial_data.php
===================================================================
--- public/install/installation/templates/sql/mysql_initial_data.php (revision 104)
+++ public/install/installation/templates/sql/mysql_initial_data.php (working copy)
@@ -4,6 +4,7 @@
INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('system', 1, 0);
INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('general', 0, 1);
INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('mailing', 0, 2);
+INSERT INTO `config_categories` (`name`, `is_system`, `category_order`) VALUES ('features', 0, 3);
INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'project_logs_per_page', '10', 'IntegerConfigHandler', 1, 0, NULL);
INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('system', 'messages_per_page', '5', 'IntegerConfigHandler', 1, 0, NULL);
@@ -28,6 +29,7 @@
INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_username', '', 'StringConfigHandler', 0, 0, NULL);
INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_password', '', 'PasswordConfigHandler', 0, 0, NULL);
INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'smtp_secure_connection', 'no', 'SecureSmtpConnectionConfigHandler', 0, 0, 'Values: no, ssl, tls');
+INSERT INTO `config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('features', 'per_project_activity_logs', '0', 'BoolConfigHandler', 0, 0, 'Show recent activity logs per project on the owner company dashboard (like BaseCamp) rather than all mashed together');
INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('zip', 'archive.png', 0, 0);
INSERT INTO `file_types` (`extension`, `icon`, `is_searchable`, `is_image`) VALUES ('rar', 'archive.png', 0, 0);