• last updated 34 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bumped to version 2.2.1b1

    • -3
    • +3
    ./assessment-portlet/assessment-portlet.info
    • -3
    • +3
    ./calendar-portlet/calendar-portlet.info
    • -5
    • +5
    ./dotlrn-assessment/dotlrn-assessment.info
    • -6
    • +6
    ./dotlrn-calendar/dotlrn-calendar.info
    • -4
    • +4
    ./dotlrn-evaluation/dotlrn-evaluation.info
  1. … 25 more files in changeset.
Added support for reply_to address

    • -28
    • +63
    ./acs-mail-lite/tcl/acs-mail-lite-procs.tcl
    • -0
    • +2
    ./acs-mail-lite/tcl/complex-send-procs-oracle.xql
    • -0
    • +2
    ./acs-mail-lite/tcl/complex-send-procs-postgresql.xql
    • -1
    • +18
    ./acs-mail-lite/tcl/complex-send-procs.tcl
Added oracle scripts, continued with the move from user_id to party_id

    • -1
    • +6
    ./acs-mail-lite/sql/oracle/acs-mail-lite-drop.sql
    • -0
    • +8
    ./acs-mail-lite/sql/oracle/upgrade/upgrade-1.0b6-1.0b7.sql
    • -0
    • +7
    ./acs-mail-lite/sql/oracle/upgrade/upgrade-1.3b5-1.3b6.sql
    • -0
    • +38
    ./acs-mail-lite/sql/oracle/upgrade/upgrade-1.3b7-1.3b8.sql
    • -0
    • +5
    ./acs-mail-lite/sql/oracle/upgrade/upgrade-1.3b8-1.3b9.sql
    • -3
    • +3
    ./acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql
    • -3
    • +3
    ./acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql
Resolve conflicts from merging oacs-5-2

    • -24
    • +0
    ./theme-selva/www/selva-site-master.adp
Remove ad_script_abort that was breaking preview

The worlds simplest mailing list

    • -2
    • +23
    ./acs-mail-lite/tcl/acs-mail-lite-procs.tcl
Change the url for creating a room to room-new (was set to room-edit after the merge from oacs-5-2)

    • -1
    • +1
    ./chat-portlet/www/chat-admin-portlet.adp
Ignore all messages not send to notifications

    • -16
    • +8
    ./notifications/tcl/notification-callback-procs.tcl
Remove inexistent apm-callback declaration

Resolving conflicts on photo-album after merging

    • -105
    • +20
    ./photo-album/tcl/photo-album-callback-procs.tcl
Added support for adding an employee directly into the system

    • -6
    • +14
    ./contacts/tcl/contacts-callback-procs.tcl
    • -114
    • +156
    ./contacts/www/contact-add.tcl
Merging dotlrn-all and dotlrn-extras from oacs-5-2

    • -0
    • +23
    ./acs-datetime/catalog/acs-datetime.cs_CZ.utf-8.xml
    • -4
    • +16
    ./acs-datetime/catalog/acs-datetime.gl_ES.ISO-8859-1.xml
    • -0
    • +28
    ./acs-datetime/catalog/acs-datetime.nl_ZA.ISO-8859-1.xml
    • -0
    • +9
    ./attachments/catalog/attachments.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.ast_ES.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.en_AU.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./bm-portlet/catalog/bm-portlet.es_CO.ISO-8859-1.xml
  1. … 868 more files in changeset.
Fixed a conflict in the file comment ...

    • -98
    • +200
    ./photo-album/tcl/photo-album-callback-procs.tcl
Fixed a conflict by commenting out a line added by Malte. Will e-mail him

for better resolution if needed (the var set in that line is set with a new

value before it is ever used).

Missed this change in my 5.3 merge

    • -1
    • +2
    ./acs-subsite/www/user/portrait/upload-2.tcl
Missed a one-line change from 5.2 in the merge ...

    • -1
    • +2
    ./acs-subsite/www/user/portrait/upload-2.tcl
Add Open Documents MIME types

file upgrade-5.3.0d3-5.3.0d4.sql was initially added on branch oacs-5-3.

    • -0
    • +0
    ./acs-content-repository/sql/oracle/upgrade/upgrade-5.3.0d3-5.3.0d4.sql
file upgrade-5.3.0d7-5.3.0d8.sql was initially added on branch oacs-5-3.

Add Open Documents MIME types

Added a necessary comment to a public proc

    • -0
    • +5
    ./acs-tcl/tcl/application-data-link-procs.tcl
This oracle sql file had a "postgresql" rdbms tag

    • -1
    • +1
    ./acs-mail-lite/tcl/complex-send-procs-oracle.xql
And the last oacs-5-3 -> HEAD merge commit (vi was being weird on the

cvs.openacs.org server so I fixed this one locally)

First round of oacs-5-3 merge to HEAD commits

    • -4
    • +4
    ./acs-api-browser/acs-api-browser.info
    • -5
    • +5
    ./acs-authentication/acs-authentication.info
    • -0
    • +5
    ./acs-authentication/catalog/acs-authentication.cs_CZ.utf-8.xml
    • -0
    • +5
    ./acs-authentication/catalog/acs-authentication.gl_ES.ISO-8859-1.xml
    • -0
    • +5
    ./acs-authentication/catalog/acs-authentication.nl_ZA.ISO-8859-1.xml
    • -4
    • +4
    ./acs-automated-testing/acs-automated-testing.info
    • -4
    • +4
    ./acs-bootstrap-installer/acs-bootstrap-installer.info
    • -7
    • +8
    ./acs-content-repository/acs-content-repository.info
    • -1
    • +3
    ./acs-content-repository/tcl/content-revision-procs.tcl
  1. … 82 more files in changeset.
Picked up some changes missed by the join of oacs-5-2 and oacs-5-3. It turns

out the cvs won't join files if it has already done some merging previously.

In this case I'd previously merged oacs-5-2 to HEAD, then branched oacs-5-3, then

reopened the 5.2 branch for minor bug fixing for .LRN 2.2.1. This confused

CVS or ... at least made it stubborn.

    • -0
    • +1
    ./search/catalog/search.pl_PL.utf-8.xml
Some oddness with the cvs tree caused cvs to not join 5.2 with 5.3 for this

file. Resolved by committing the 5.2 version, after discussion with emmar.

Merged oacs-5-2 -> oacs-5-3 branches.

    • -0
    • +5
    ./acs-authentication/catalog/acs-authentication.cs_CZ.utf-8.xml
    • -0
    • +5
    ./acs-authentication/catalog/acs-authentication.gl_ES.ISO-8859-1.xml
    • -0
    • +5
    ./acs-authentication/catalog/acs-authentication.nl_ZA.ISO-8859-1.xml
    • -1
    • +1
    ./acs-bootstrap-installer/db-init-checks-oracle.tcl
    • -7
    • +8
    ./acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl
    • -1
    • +3
    ./acs-content-repository/tcl/content-revision-procs.tcl
    • -0
    • +84
    ./acs-kernel/catalog/acs-kernel.cs_CZ.utf-8.xml
    • -0
    • +2
    ./acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml
    • -0
    • +2
    ./acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml
    • -3
    • +100
    ./acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml
    • -0
    • +125
    ./acs-kernel/catalog/acs-kernel.nl_ZA.ISO-8859-1.xml
    • -35
    • +75
    ./acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml
  1. … 52 more files in changeset.
Added informal salutation

Support for locales of parties. New I18N

Commented out account manager, cleaned up the code