• last updated 18 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge from oacs-5-10

  1. … 8099 more files in changeset.
Whitespace cleanup

merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files 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.
Bug stomp: added documentation to acs core procs that had no docs.

  1. … 2 more files 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.
Adding merge namespace. Now the callbacks will be defined under this namespace

Moving the code that reassign objects from local authentication procs to the merge procs library.

  1. … 3 more files in changeset.
Adding the new callback MergeShowUserInfo

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

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.