• last updated 15 mins 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.
make boolean tests in .adp files more uniform

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

  1. … 345 more files in changeset.
Use existing message key

Improve the control panel, community member pages UI (approved by honchos).

  1. … 6 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: HTML cleanup

  1. … 11 more files in changeset.
Merging Nima's changes: i18n

  1. … 7 more files in changeset.
Reverted all changes from Mannheim

  1. … 222 more files in changeset.
Mannheim update, fix and merge bugbash

  1. … 197 more files in changeset.
First shot at merging oacs-5-2 apps used in .LRN to HEAD.

  1. … 2478 more files in changeset.
Got rid of unused facilitator-bio script in www, and renamed lib/facilitator-bio

to bio since it's used for everyone's bio, not just facilitators.

SOLUTION GROVE: QUIT HARDWIRING ENGLISH INTO .LRN.

  1. … 9 more files in changeset.
Fixed community-member page. First it now checks if the forums package is installed and it actually pretends to use forums and not weblog from the name of the variables.

  1. … 1 more file in changeset.
committing changes, improvements and fixes to assessment, assessment-portlet, dotlrn, dotlrn-assessment, dotlrn-catalog, dotlrn-evaluation, ecommerce, evaluation and evaluation-portlet

  1. … 913 more files in changeset.
commit to HEAD of merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040724 and jcd-merge-5-1-20050111

  1. … 2275 more files in changeset.
no quote to context bar added

Before:

A long biography would push the portrait on the page buttom

Portrait had a blue border to indicate the link

Biographie didn't support HTML

Now:

Used table to have biography on the left and portrait on the right

Removed border with border="0"

Added noquote to @bio@

fix portrait link bug 1015 patch 327 Martin Magerl

Fixed bug #1015: wrong link to portrait

Homepage URL got overwritten with the filestorage URL

  1. … 2 more files in changeset.
I18N: converting one text in adp into message lookup

  1. … 1 more file in changeset.
making sure the portrait shows up on the community member page. Fixing noquote issue on dotlrn user admin page

  1. … 1 more file 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.
applying patch 484 which fixes portrait, homepage, and images bugs on the community member page.

  1. … 1 more file 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.
display link for user's portrait if one exists (existing code didn't work)

seems the portrait code was copied over from the acs-subsite community member page, however, they forgot to change the relative url in the links to the portrait and portrait-bits pages. Fixed that by using absolute URIs to those pages under the main site (prefixing with /shared/).

I18N: merging many one word messages into messages containing phrases to make translation to languages such as finnish easier (for example, finnish doesn't have prepositions). For the en_US messages I have decided to keep the reuse of pretty names of classes, departments etc. inside other messages. This reuse is optional though and will not be appropriate for some languages (such as finnish).

  1. … 32 more files in changeset.