• last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge from oacs-5-10

  1. … 8095 more files in changeset.
Do not interrupt the whole script, just return the template

Port of downstream behavior:

- never display all of the rooms, but only those where we have access (e.g. read permission and not banned) on the specified packages

- when the portlet is rendered outside of a community, e.g. in the personal home, split chat rooms by package (community name)

- considered rendering outside a connection or lack of package as shaded

- display number of currently connected users

- (Postgres only) provide a more efficient query when one might have access to many chats

Cus short computations when the portlet is shaded

Reduce divergency between Oracle and Postgres codebase

Cleanup the vestigial moderated_p flag

  1. … 8 more files in changeset.
Get rid of the intermediate "room-enter" page and enforce all of the relevant permission in place in the "chat" page, cleanup variables and update automated tests

  1. … 5 more files in changeset.
added editor hints and white-space cleanup

  1. … 23 more files in changeset.
Bring files on oacs-5-10 in sync with HEAD

  1. … 161 more files in changeset.
Revert reduction of divergency between oracle and postgres codebase:

this conflicts hard with downstream code and results in less scalable behavior

Add editor hints

Reduce divergency between oracle and postgres codebase

Remove reference to client, as now this is decided in the xowiki chat implementation

Prefer 'incr' to increment variables instead of 'expr'.

  1. … 3 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. … 367 more files in changeset.
merged changes from the oacs-5-9 branch and resolved conflicts

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

  1. … 4 more files in changeset.
- brace expression

- replace depreacted "ad_parameter" by parameter::get

- replace deprecated "ad_permission_p" by "permission::permission_p"

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.
Added link to enter chat room in html mode

HTML Strict cleanup

don't show the content of the portlet when shaded

Rolled back to 5.3

  1. … 6 more files in changeset.
reverting pablom's commits to oacs-5-2: see http://openacs.org/forums/message-view?message_id=1042586

  1. … 6 more files in changeset.
"New version of the package"

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

  1. … 1555 more files in changeset.
Zen: HTML cleanup

  1. … 3 more files in changeset.
Change the url for creating a room to room-new (was set to room-edit after the merge from oacs-5-2)

Merging dotlrn-all and dotlrn-extras from oacs-5-2

  1. … 881 more files in changeset.