• last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
strengthen page contracts

  1. … 16 more files in changeset.
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
- replace "javascript:*" urls with event listeners

  1. … 1 more file in changeset.
.xql-file reform of acs-admin

- remove sql statements from the code, where these are provided via .xql

- prefer empty sql statements over various forms of *SQL*

- remove obsolete Oracle queries

member_approve

member_ban

member_reject

member_deleted

member_unapprove

user_info

- remove obsolete .xql files (containing only unused query names)

www/users/modify-admin-privileges-oracle.xql

www/users/modify-admin-privileges-postgresql.xql

www/users/user-add-2.xql

  1. … 13 more files in changeset.
- add editor hints to keep spaces/tabs in the furture more consistent

  1. … 754 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2547 more files in changeset.
- check ids in page contracts

  1. … 36 more files in changeset.
Remove header stuff from core. Use template::head procedures.

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

  1. … 6 more files in changeset.
Normalizing string comparison operations into tcl 8.4 operations, enabling byte-code compilation for expressions and many conditionals

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

  1. … 96 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. … 5 more files in changeset.
Fixed bug #2999: Merge users fails.

  1. … 1 more file in changeset.
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. … 721 more files in changeset.
Improving the resultant messages output of each callback of the merge process

  1. … 2 more files in changeset.
Adding missing -object_id switch to site_node::get_url_from_object_id calls

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. … 13 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. … 16 more files in changeset.
file merge.tcl was initially added on branch oacs-5-2.