User: stalski Branch: DRUPAL-6--2 Date: Sun, 16 Nov 2008 23:03:14 +0000 Modified files: /modules/heartbeat heartbeat.admin.inc heartbeat.install heartbeat.module /modules/heartbeat/user_activity/modules/friendlist_activity friendlist_activity.install friendlist_activity.rules.inc /modules/heartbeat/user_activity user_activity.install user_activity.rules.inc Log message: Started the concatenated logic to build messages on the fly if they happened together with a another simelar event. The messages should be merged in views, so i added message_concat and concat_args as heartbeat_message fields Links: http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/heartbea... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/heartbea... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/heartbea... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/user_act... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/user_act... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/user_act... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/user_act...