Activity OpenACS/

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

- -23
- +20
/openacs-4/contrib/packages/simulation/www/index.adp
- History
- Source
- Diff
/openacs-4/contrib/packages/.../www/index.adp
- -2
- +1
/openacs-4/contrib/packages/simulation/www/map-master.adp
- History
- Source
- Diff
/openacs-4/contrib/.../www/map-master.adp
- -12
- +10
/openacs-4/contrib/packages/simulation/www/simplay/case-admin.adp
- History
- Source
- Diff
/openacs-4/contrib/.../simplay/case-admin.adp
- -11
- +14
/openacs-4/contrib/packages/simulation/www/simplay/case.adp
- History
- Source
- Diff
/openacs-4/contrib/.../simplay/case.adp
- -21
- +20
/openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp
- History
- Source
- Diff
/openacs-4/contrib/.../control-bar.adp
- -15
- +421
/openacs-4/contrib/packages/simulation/www/simplay/index.adp
- History
- Source
- Diff
/openacs-4/contrib/.../simplay/index.adp
- -2
- +2
/openacs-4/contrib/packages/survey/survey.info
- History
- Source
- Diff
/openacs-4/contrib/.../survey/survey.info
- -12
- +3
/openacs-4/contrib/packages/survey/sql/postgresql/survey-package-create.sql
- History
- Source
- Diff
/openacs-4/.../survey-package-create.sql
- -0
- +15
/openacs-4/contrib/packages/survey/sql/postgresql/upgrade/upgrade-0.4-0.5.sql
- History
- Source
- Diff
/openacs-4/contrib/.../upgrade-0.4-0.5.sql
- -0
- +1
/openacs-4/etc/config.tcl
- History
- Source
- Diff
/openacs-4/etc/config.tcl
- -1
- +3
/openacs-4/packages/acs-admin/acs-admin.info
- History
- Source
- Diff
/openacs-4/packages/.../acs-admin.info
- -2
- +2
/openacs-4/packages/acs-admin/www/apm/index.tcl
- History
- Source
- Diff
/openacs-4/packages/.../apm/index.tcl
- -2
- +2
/openacs-4/packages/acs-admin/www/install/install-3.tcl
- History
- Source
- Diff
/openacs-4/packages/.../install/install-3.tcl
- -3
- +5
/openacs-4/packages/acs-api-browser/acs-api-browser.info
- History
- Source
- Diff
/openacs-4/packages/.../acs-api-browser.info
- -7
- +7
/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
- History
- Source
- Diff
/openacs-4/.../acs-api-documentation-procs.tcl
… 820 more files in changeset.

4:56 pm

jeffd

\<a left in when fixing bug 1266

- -1
- +1
/openacs-4/packages/dotlrn/www/manage-memberships.adp
- History
- Source
- Diff
/openacs-4/.../manage-memberships.adp

4:49 pm

lars

More
oacs-5-1:lars:20040517144936
changed 1 file
oacs-5-1

Fixed bug where the 'alert me/do not alert me' logic was reversed, so you'd think you signed up, but in reality you just canceled your notification

- -1
- +1
/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.adp
- History
- Source
- Diff
/openacs-4/.../dotlrn-homework-admin-portlet.adp

3:51 pm

jeffd

More
MAIN:jeffd:20040517135109
changed 1 file
MAIN

changed name from rating_img to stars

- -2
- +2
/openacs-4/contrib/packages/cop-ui/www/categories/index.tcl
- History
- Source
- Diff
/openacs-4/contrib/.../categories/index.tcl

3:27 pm

olah

More
MAIN:olah:20040517132749
changed 6 files
MAIN

Added support for non-automatic aggregator generation for registered users (parameterized). Bug # 1827

- -2
- +3
/openacs-4/packages/news-aggregator/news-aggregator.info
- History
- Source
- Diff
/openacs-4/packages/.../news-aggregator.info
- -0
- +9
/openacs-4/packages/news-aggregator/www/aggregator.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/aggregator.tcl
- -1
- +16
/openacs-4/packages/news-aggregator/www/index.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/index.tcl
- -0
- +7
/openacs-4/packages/news-aggregator/www/public-aggregators.adp
- History
- Source
/openacs-4/packages/.../www/public-aggregators.adp
- -0
- +40
/openacs-4/packages/news-aggregator/www/public-aggregators.tcl
- History
- Source
/openacs-4/packages/.../www/public-aggregators.tcl
- -0
- +16
/openacs-4/packages/news-aggregator/www/public-aggregators.xql
- History
- Source
/openacs-4/packages/.../www/public-aggregators.xql

3:02 pm

jeffd

More
MAIN:jeffd:20040517130216
changed 5 files
MAIN

add flag to lars_blog_get_as_string to specify a different display template, add lib/titles.adp which is a minimal example of such a template, move generation of permalink_url out of blog.tcl since it should be passed in to the display template, change lars_blogger_get_as_string to take create_p since that is the perm that matters (not admin)

- -0
- +12
/openacs-4/packages/lars-blogger/lib/titles.adp
- History
- Source
/openacs-4/packages/.../lib/titles.adp
- -8
- +17
/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl
- History
- Source
- Diff
/openacs-4/.../lars-blogger-procs.tcl
- -2
- +11
/openacs-4/packages/lars-blogger/www/blog.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/blog.tcl
- -7
- +1
/openacs-4/packages/lars-blogger/www/entry-chunk.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/entry-chunk.tcl
- -0
- +2
/openacs-4/packages/lars-blogger/www/one-entry.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/one-entry.tcl

7:29 pm

daveb

More
oacs-5-1:daveb:20040516172927
changed 4 files
oacs-5-1

Fix NULL in expr when trying to divide content size. Coalesce to 0.

- -1
- +1
/openacs-4/packages/file-storage/www/file-oracle.xql
- History
- Source
- Diff
/openacs-4/packages/.../www/file-oracle.xql
- -1
- +1
/openacs-4/packages/file-storage/www/file-postgresql.xql
- History
- Source
- Diff
/openacs-4/packages/.../file-postgresql.xql
- -2
- +2
/openacs-4/packages/file-storage/www/file.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/file.tcl
- -2
- +2
/openacs-4/packages/file-storage/www/folder-chunk.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/folder-chunk.tcl

7:24 pm

daveb

More
oacs-5-1:daveb:20040516172435
changed 4 files
oacs-5-1

Use pretty mime type label on file details page. Show kb if over 1kb on folder listing and file details pages.

- -2
- +4
/openacs-4/packages/file-storage/www/file-oracle.xql
- History
- Source
- Diff
/openacs-4/packages/.../www/file-oracle.xql
- -2
- +3
/openacs-4/packages/file-storage/www/file-postgresql.xql
- History
- Source
- Diff
/openacs-4/packages/.../file-postgresql.xql
- -3
- +8
/openacs-4/packages/file-storage/www/file.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/file.tcl
- -4
- +4
/openacs-4/packages/file-storage/www/folder-chunk.tcl
- History
- Source
- Diff
/openacs-4/packages/.../www/folder-chunk.tcl

7:08 pm

daveb

More
oacs-5-1:daveb:20040516170840
changed 2 files
oacs-5-1

Remove misnamed upgrade script.

- -69
- +0
/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0.d4.sql
- History
- Source
- Diff
/openacs-4/.../upgrade-5.1.0d3-5.1.0.d4.sql
- -1
- +71
/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql
- History
- Source
- Diff
/openacs-4/.../upgrade-5.1.0d3-5.1.0d4.sql

6:53 pm

daveb

More
MAIN:daveb:20040516165307
deleted 2 files
MAIN

file upgrade-5.1.0d3-5.1.0d4.sql was initially added on branch oacs-5-1.

- -0
- +0
/openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0d3-5.1.0d4.sql
- History
- Source
/openacs-4/.../upgrade-5.1.0d3-5.1.0d4.sql
- -0
- +0
/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql
- History
- Source
/openacs-4/.../upgrade-5.1.0d3-5.1.0d4.sql

6:53 pm

daveb

More
oacs-5-1:daveb:20040516165306
changed 7 files
oacs-5-1

Show title on folder listing. If filename is different than title, show that as well. Show cr_mime_types.label mime type description instead of techincal mime type "code".