• last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge of oacs-5-2 and head

Adding missing -object_id switch to site_node::get_url_from_object_id calls

What can I say.... Strings in the SQL file ... At least now they are I18Ned.

Changed the default behaviour to hours and to use subprojects as this is the default on four of our websites and I'm lazy for new development :).

Undid previous commit

removed ns_log's for test new code

file ref-countries.de_DE.ISO-8859-1.xml was added on branch oacs-5-2 on 2005-09-08 10:00:19 +0000

file ref-countries.en_US.ISO-8859-1.xml was added on branch oacs-5-2 on 2005-09-08 10:00:19 +0000

Added message keys

  1. … 20 more files in changeset.
the group_name should be acs-translated

The group name should be acs-translated

More common terms

use new function instantiate_and_mount

fix dotlrn_* remove_user not implimented!

fix dotlrn_* remove_user not implimented!

fix dotlrn_* remove_user not implimented!

Adding an 'if' clause in adp merge final page if the user doesn't want to merge.

bugfix: check for missing dynamic attributes

Adding the new callback MergeShowUserInfo

file local-procs.xql was initially added on branch oacs-5-2.

file upgrade-5.1.5-5.2.0a1.sql was initially added on branch oacs-5-2.

Fixing bugs in user merge support. Improving the process, making it more generic and now it works for acs-core. Adding the upgrade scripts for oracle and pg.

Added removed language keys again, as they were needed.

Make sure that options are correctly localized before display.

Created dummy callback procedure for use in 5.1. Added callback procs back into contact-add.tcl

    • -2
    • +13
    /openacs-4/packages/contacts/tcl/contacts-init.tcl
taking up version for release

Taking up version for release

taking up the version for release

Merge changes from HEAD 070605

add 2 tables to (still deficient) drop scripts