• last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge with missing files

  1. … 1464 more files in changeset.
merge from oacs-5-10

  1. … 8098 more files in changeset.
Fix proc and contract doc elements, so they are properly parsed by apidoc::api_*_documentation.

- @cvs_id -> @cvs-id

- @version -> @cvs-id

- @creation_date -> @creation-date

- @date -> @creation-date

- Different variations of $Id$

- Remove wrong @param entry

- Fix typos

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

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

  1. … 2545 more files in changeset.
- replace deprecated "ad_get_user_id" by "ad_conn user_id"

- fix bug #3200

  1. … 1 more file 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. … 376 more files in changeset.
Remove package versions from catalog files. Specify table in query

  1. … 2 more files in changeset.
changeing message key acs-kernel.common_no to acs-kernel.common_No (since the label is No as well), adding a new message key acs-kernel.common_no (with lower case "no")

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

  1. … 1551 more files in changeset.
Merging dotlrn-all and dotlrn-extras from oacs-5-2

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

  1. … 2475 more files in changeset.
using email image for members

Changing to user email_image

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.
merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040712 and jcd-merge-5-1-20040724 to HEAD

  1. … 137 more files in changeset.
merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040517 and jcd-merge-5-1-20040628 to HEAD

  1. … 686 more files in changeset.
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.
merge all the changes on the oacs-5-1 and dotlrn-2-0 branches up to tag jcd-merge-20040420

  1. … 643 more files in changeset.
Fixed the Edit group properties part of #173 making the string a message key

  1. … 1 more file in changeset.
Highlight the selected enrollment policy/bulk mail policy

Removed teaching assistants and course assistants bullets when there are none

    • -24
    • +20
    ./dotlrn-members-staff-portlet.adp
Fixed noquote bug

  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

    • -19
    • +28
    ./dotlrn-members-staff-portlet.adp
    • -26
    • +30
    ./dotlrn-members-staff-portlet.tcl
  1. … 119 more files in changeset.
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. … 1 more file in changeset.
merging the dotlrn-1-0 branch down onto HEAD (the trunk)

  1. … 195 more files in changeset.
localizing some texts in the UI that I had missed

  1. … 1 more file in changeset.
I18N: converting dotlrn-portlet package to using the message catalog

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

  1. … 539 more files in changeset.