Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.136.2.1 -r1.136.2.2
--- openacs-4/packages/acs-kernel/acs-kernel.info 25 Aug 2015 17:16:36 -0000 1.136.2.1
+++ openacs-4/packages/acs-kernel/acs-kernel.info 5 Sep 2015 09:17:50 -0000 1.136.2.2
@@ -9,15 +9,15 @@
f
t
-
+
OpenACS Core Team
Routines and data models providing the foundation for OpenACS-based Web services.
2013-09-08
OpenACS
The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures.
3
-
+
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml,v
diff -u -r1.46 -r1.46.2.1
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml 27 Oct 2014 16:39:35 -0000 1.46
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml 5 Sep 2015 09:17:50 -0000 1.46.2.1
@@ -125,6 +125,8 @@
banned
Deleted
deleted
+ Merged
+ merged
Needs Approval
needs approval
Rejected
Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -r1.39 -r1.39.2.1
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl 27 Oct 2014 16:39:45 -0000 1.39
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl 5 Sep 2015 09:17:50 -0000 1.39.2.1
@@ -440,6 +440,7 @@
banned #acs-kernel.member_state_banned#
rejected #acs-kernel.member_state_rejected#
deleted #acs-kernel.member_state_deleted#
+ merged #acs-kernel.member_state_merged#
}
return [lang::util::localize $message_key_array($member_state)]