• last updated 9 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
- replace "<include ... />" by "<include ... >", since adp parser in

AOLserver and NaviServer passes "/" as argument to the adp-include.

  1. … 14 more files in changeset.
make boolean tests in .adp files more uniform

  1. … 16 more files in changeset.
- standardize argument passing to adp-includes, don't perform double i18n and double quoting

  1. … 124 more files in changeset.
- fix and standardize quoting in template properties

  1. … 345 more files in changeset.
1. Merge 2.4.1 to HEAD other than assessment, imsld, lorsm, and views.

2. Bump version numbers to 2.5.0d1.

  1. … 379 more files in changeset.
Checkpoint 3.7 (level AA): Mark up quotations. Do not use quotation markup for formatting effects such as indentation.

  1. … 31 more files in changeset.
Merged changes to HEAD ...

  1. … 1556 more files in changeset.
Zen cleanup of dotlrn non-admin pages - end of first round (still needs some list builder and form builder work as outlined in the zen todo list) - also includes some i18n and removal of MIT help text that keeps sneaking back in

  1. … 6 more files in changeset.
bug 515, require dotlrn admin to add a full access user. also cleaned up context bar

  1. … 2 more files in changeset.
Focus

Do not center the form, makes it look really ugly (input fields are centered within themselves

making the dotlrn user-add pages reuse the user-new include from acs-subsite

  1. … 3 more files in changeset.
I didn't really change all these files but (sigh) was working with a

copy of a checkout ... should've soft linked instead. I did change a

fairly large number of files which is why I'm letting this large

commit go through rather than figure out which.

I removed default-dotlrn-master.* because dotlrn-master.* is the one we

use. I removed explicit references to dotlrn-master in templates because

someone should be able to use a private copy of dotlrn-master with a

different name if they wish. I fixed a few noquote issues (by no means all)

  1. … 30 more files in changeset.
merging dotlrn-1-0-1 tag down onto head. Thanks to Jarkko Laine and Mohan Pakkurti for all the help. See comments at http://openacs.org/storage/download/index?version_id=104101

  1. … 121 more files in changeset.
merging the dotlrn-1-0 branch down onto HEAD (the trunk)

  1. … 200 more files in changeset.
making the dotlrn package (with its .adp, .info, and .tcl files) use the message catalog

  1. … 192 more files in changeset.
sloan - additional privacy options, some help text

  1. … 3 more files in changeset.
copyright OpenForce -> MIT

  1. … 546 more files in changeset.
adding license

  1. … 395 more files in changeset.
fixing master stuff

  1. … 60 more files in changeset.
removed refs to local master template so we can keep the staging server in sync better

  1. … 23 more files in changeset.
more bug fixes

  1. … 14 more files in changeset.
portal pages version 1.0

  1. … 47 more files in changeset.
some minor fixes

  1. … 55 more files in changeset.