• last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
change ad_verify_and_get_user_id to ad_conn user_id, change ad_maybe_redirect_for_registration to auth::require_login, make some db_ and dt_ function -public

  1. … 689 more files in changeset.
Display of email replaced with email_image proc call

merge changes on oacs-5-1 branch to head, changes between jcd-merge-20040420 and jcd-merge-5-1-20040517 were merged, head pre changes is jcd-merge-pre-20040517 and post is jcd-merge-post-20040517

  1. … 833 more files in changeset.
Adding users in a subsite per batch did not add them to the subsite as members.

Fix typo: inivite to invite

Changed standard-lars -> standard form template style

  1. … 14 more files in changeset.
merge all the changes on the oacs-5-1 and dotlrn-2-0 branches up to tag jcd-merge-20040420

  1. … 641 more files in changeset.
file user-batch-add-2.adp was initially added on branch oacs-5-1.

file user-batch-add.tcl was initially added on branch oacs-5-1.

file user-batch-add.adp was initially added on branch oacs-5-1.

file user-batch-add-2.tcl was initially added on branch oacs-5-1.

moving bulk user add pages from /acs-admin to subsite admin

  1. … 6 more files in changeset.
merge of changes between oacs-5-0-0b4 and oacs-5-0-0-final to HEAD

  1. … 281 more files in changeset.
Moved all actions to last column

group::add_member now handles admin_rels correctly, so we don't need the bandaid here

Removing members now requires user_id, not rel_id, because we may need to remove more than one rel

Remove both membership_rel and admin_rel when removing members

Also offer to add users who already have an admin_rel, but no membership_rel

bug fix: removing semicolon from xql file

merge of changes on oacs-5-0 branch to oacs-5-0-0b4 tag

  1. … 598 more files in changeset.
Further bug 1144 diddling that should be consistent with any 5.1 changes

Further bug 1144 diddling that should be consistent with any 5.1 changes

to relational segments and groups.

Move over the bandaid patch for bug #1144 from the 5.0 branch. This needs

to be fixed for real (including datamodel changes with upgrade scripts) in

5.1.

  1. … 3 more files in changeset.
Forgot to add this earlier...

file make-member.xql was initially added on branch oacs-5-0.

An additional whacka-hack bandaid patch for relseg usage to cover up the

fact that they won't really be fixed properly 'til 5.1.

Did a bandaid patch for bug number 1144. The views were fixed earlier but

the new pages in acs-subsite assumed that a user could only belong to one

relseg at a time.

  1. … 2 more files in changeset.
Simplified make-admin and make-member pages, now that we have a better group::add_member that knows to delete existing relations

Another partial fix for #1144: join on rel_id, too, so when a user has two rows in cc_users he only shows up twice, not four times (cartesian product of all the relations)

Changed naming of 'Community' to 'Subsite', following consensus on a recent thread on the forums on that topic. Removed distinction between children of subsites and children of the main site, since 'Subsubsites' wouldn't sound that great.

  1. … 10 more files in changeset.