• last updated 14 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging changes

file invoices-portlet.de_DE.ISO-8859-1.xml was initially added on branch oacs-5-2.

I18N

I18N

Don't try to get the package id of folder_id 0 (which isn't a folder anyway!)

file upgrade-5.2.0b5-5.2.0b6.sql was initially added on branch oacs-5-2.

file mail-tracking.tcl was added on branch oacs-5-2 on 2005-11-30 15:31:02 +0000

    • -0
    • +0
    ./packages/contacts/www/mail-tracking.tcl
file message.tcl was added on branch oacs-5-2 on 2005-11-30 15:31:02 +0000

file message.adp was added on branch oacs-5-2 on 2005-11-30 15:31:02 +0000

file message-ae.tcl was added on branch oacs-5-2 on 2005-11-30 15:31:02 +0000

    • -0
    • +0
    ./packages/contacts/www/message-ae.tcl
Reverted the change we made to use acs-mail-lite/lib/email. Was a bad idea. Fixed missing emp_f in mail-tracking include

    • -0
    • +5
    ./packages/contacts/lib/history-portlet.tcl
    • -1
    • +1
    ./packages/contacts/www/mail-tracking.tcl
    • -2
    • +2
    ./packages/contacts/www/message-ae.tcl
    • -18
    • +1
    ./packages/contacts/www/message.adp
file contacts-callback-procs.tcl was added on branch oacs-5-2 on 2005-11-30 15:31:01 +0000

Made sure upgrade_user does not try to upgrade an already existing user and that it does not try to add user_preferences if they already exist

    • -30
    • +37
    ./packages/contacts/tcl/contacts-procs.tcl
Add a where clause to this query to prevent it from updating all of cr_revisions.

    • -1
    • +1
    ./packages/dynamic-types/tcl/form-procs.xql
increment version number to get changes in code and i18N messages

file list-attributes.xql was added on branch oacs-5-2 on 2005-11-30 16:21:53 +0000

    • -0
    • +0
    ./packages/ams/www/list-attributes.xql
adding i18N messages

file list-attributes.tcl was added on branch oacs-5-2 on 2005-11-30 16:21:53 +0000

    • -0
    • +0
    ./packages/ams/www/list-attributes.tcl
adding validation so you cant map an attribute_id to a another related list (to avoid duplicates)

    • -5
    • +36
    ./packages/ams/www/list-attributes.tcl
    • -0
    • +45
    ./packages/ams/www/list-attributes.xql
file use-dotlrn_forums.tcl was initially added on branch oacs-5-2.

    • -0
    • +0
    ./packages/datamanager/www/use-dotlrn_forums.tcl
*** empty log message ***

    • -63
    • +3
    ./packages/datamanager/www/manage-object1.tcl
    • -3
    • +71
    ./packages/datamanager/www/manage-object1.xql
    • -1
    • +6
    ./packages/datamanager/www/one-object-copy.adp
    • -7
    • +42
    ./packages/datamanager/www/one-object-copy.tcl
    • -1
    • +1
    ./packages/datamanager/www/one-object-move.adp
    • -7
    • +14
    ./packages/datamanager/www/one-object-move.tcl
    • -3
    • +0
    ./packages/datamanager/www/select-objects.tcl
Fixed Daveb's translation of his PG change to this script (he didn't have

oracle to test his changes on)

making changes to fit with project-manager-portlet/lib/tasks include

    • -3
    • +5
    ./packages/project-manager/lib/tasks.tcl
making use of the new parameter in project-manager to show the username instead of the full name to show on the listemplate for tasks and also addina an ordewrby_p var to know if we want to show the orderby menu or not

    • -40
    • +68
    ./packages/project-manager/lib/tasks.tcl
    • -1
    • +19
    ./packages/project-manager/www/tasks.adp
adding new parameter to show the full name f the user or just it's username

making use of the new parameter in project-manager to show the username instead of the full name to show on the listemplate for tasks

making changes on filter since xql query now changed

file invoices-portlet.tcl was added on branch oacs-5-2 on 2005-11-30 16:01:59 +0000

file invoices-portlet.adp was added on branch oacs-5-2 on 2005-11-30 16:01:59 +0000

file invoices-list-portlet.tcl was added on branch oacs-5-2 on 2005-11-30 16:01:59 +0000