• last updated 17 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2

on oacs-4-6 are included.

    • -1
    • +1
    ./packages/forums/www/index-oracle.xql
    • -1
    • +1
    ./packages/forums/www/index-postgresql.xql
    • -2
    • +2
    ./packages/forums/www/message-view.adp
    • -0
    • +2
    ./packages/lars-blogger/lars-blogger.info
  1. … 42 more files in changeset.
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2

on oacs-4-6 are included.

    • -0
    • +1
    ./packages/acs-subsite/www/index-oracle.xql
  1. … 62 more files in changeset.
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2

on oacs-4-6 are included.

    • -0
    • +4
    ./packages/acs-admin/www/users/index.adp
    • -1
    • +1
    ./packages/acs-admin/www/users/one-oracle.xql
    • -7
    • +11
    ./packages/acs-admin/www/users/one.adp
    • -2
    • +4
    ./packages/acs-admin/www/users/one.tcl
    • -1
    • +2
    ./packages/acs-admin/www/users/one.xql
  1. … 19 more files in changeset.
merge changes for context id and default of instance name to pretty name from package info

davb accidentally pulled in i18n changes to 4.6 when fixing the

search url lookup. Backed them out and applied only his change.

Use apm_package_url_from key to get the url for the search package.

Use apm_package_url_from_key to find search package url.

merge changes from 4.6

Fix links to the LDP guide closes bug 148

merge one bugfix from oacs-4-6

    • -2
    • +2
    ./packages/file-manager/www/file-upload-2.tcl
- Update Installer to require PG 7.2, since we are requiring it for 4.6

- Added check for 7.3 saying it's not supported at the moment.

- Removed check needed for 7.1, since it's not necessary for 7.2

removing HTML support for spam (message_type parameter) as it is not yet supported by bulk-mail and will not be in 1-0 release of dotLRN

Fixed news_util_get_url to accept package_id instead of package_key to support

multiple instances of news.

Fixed news_util_get_url to accept package_id instead of package name to support

multiple instances of news.

Committing latest stage of workflow Tcl API. Most of this beautiful code was written by Lars Pind.

    • -8
    • +90
    ./packages/workflow/tcl/action-procs.tcl
    • -14
    • +62
    ./packages/workflow/tcl/action-procs.xql
    • -0
    • +15
    ./packages/workflow/tcl/case-procs-postgresql.xql
    • -0
    • +474
    ./packages/workflow/tcl/case-procs.tcl
    • -0
    • +161
    ./packages/workflow/tcl/case-procs.xql
    • -25
    • +52
    ./packages/workflow/tcl/fsm-procs.tcl
    • -12
    • +5
    ./packages/workflow/tcl/fsm-procs.xql
    • -0
    • +199
    ./packages/workflow/tcl/install-procs.tcl
    • -18
    • +36
    ./packages/workflow/tcl/role-procs.tcl
  1. … 5 more files in changeset.
merge changes from 4.6

    • -8
    • +6
    ./packages/acs-tcl/tcl/00-database-procs.tcl
Corrects db_transaction doc. Closes bug 104/patch 22 Vinod Kurup

    • -3
    • +3
    ./packages/acs-tcl/tcl/00-database-procs.tcl
Use posting_date_ansi + adds error check for non doubleclick submit error. closes bug 103/patch 21 Vinod Kurup

    • -7
    • +7
    ./packages/forums/tcl/messages-procs.tcl
merge link fixes from oacs-4-6 to head

Fix links to old openacs.org site. closes bug 114/patch 31 Ola Hansson

changing bootstrapping code to use new apm_load_tests_p proc that is also used after package installation in APM

changing message after package installation to reflect that server restart is no longer necessary. Caching if package is enabled after installation as is done in bootstrap.tcl

adding proc apm_load_tests_p. changing a couple of procs to proper use of boolean argument

    • -3
    • +2
    ./packages/acs-tcl/tcl/apm-file-procs.tcl
    • -4
    • +4
    ./packages/acs-tcl/tcl/apm-install-procs.tcl
    • -9
    • +20
    ./packages/acs-tcl/tcl/apm-procs.tcl
Adds patch status filtering on patch-list page (from openacs.org)

    • -2
    • +2
    ./packages/bug-tracker/www/patch-list.adp
    • -6
    • +33
    ./packages/bug-tracker/www/patch-list.tcl
updated documentation to include new switch, case and default tags. Note was also added to 'if' tag for documenting elseif.

    • -0
    • +16
    ./packages/acs-templating/www/doc/tagref/if.html
    • -0
    • +84
    ./packages/acs-templating/www/doc/tagref/switch.html
Bad oracle fetch_paths query merged from oacs-4-6

Bad oracle fetch_paths query closes bug 122/patch 40 C. R. Oldham

merge patch 14 from oacs-4-6

    • -2
    • +2
    ./packages/acs-templating/tcl/util-procs.tcl
Bad varname in template::util::multirow_to_list closes 91/patch 14 Ola Hansson

    • -2
    • +2
    ./packages/acs-templating/tcl/util-procs.tcl
merge fix for bug 143 to head