• last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Non-info file merge results, with conflicts resolved.

  1. … 201 more files in changeset.
Substitute ns_sendmail calls for acs_mail_lite::send one

  1. … 1 more file in changeset.
add option to delete users from the admin pages (acs-admin/users/one)

- cleanup: reduce usage of deprecated functions (ad_parameter)

  1. … 5 more files in changeset.
HTML Strict cleanup: removed trailing slash of input, img, link, meta tags

  1. … 16 more files in changeset.
HTML strict cleanup: removed trailing slash of HR and BR tags

  1. … 24 more files in changeset.
Drop database type from generic sql file.

Remove header stuff from core. Use template::head procedures.

Add template::head::add_style to add inline styles.

  1. … 5 more files in changeset.
Made sure we are using the right user-new template

changing <br/> to <br> to meet html transitional validation requirements

  1. … 12 more files in changeset.
Added support for after user state change callback

  1. … 2 more files in changeset.
Added link for bouncing users

    • -0
    • +53
    ./bouncing-users.tcl
    • -0
    • +15
    ./bouncing-users.xql
Normalizing string comparison operations into tcl 8.4 operations, enabling byte-code compilation for expressions and many conditionals

  1. … 357 more files in changeset.
First round of oacs-5-3 merge to HEAD commits

  1. … 95 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.

  1. … 4 more files in changeset.
Fixed bug #2999: Merge users fails.

Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.

TODO:

1. Bump acs-core package version numbers to 5.3.0d1

2. Would be nice to do a test install, wouldn't it?

  1. … 710 more files in changeset.
Improving the resultant messages output of each callback of the merge process

Adding a proc call that will merge the users objects, permissions and protraits

Adding missing -object_id switch to site_node::get_url_from_object_id calls

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

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.

  1. … 8 more files in changeset.
Adding GUI to merge user accounts. I modified the 'one acs admin user' page and 'search' page to support this.

  1. … 5 more files in changeset.
file merge.xql was initially added on branch oacs-5-2.

file merge.tcl was initially added on branch oacs-5-2.

file merge.adp was initially added on branch oacs-5-2.

file merge-postgresql.xql was initially added on branch oacs-5-2.

file merge-oracle.xql was initially added on branch oacs-5-2.

file merge-final.tcl was initially added on branch oacs-5-2.

file merge-final.adp was initially added on branch oacs-5-2.