• last updated 10 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Ahhh...my missing conflict resolutions ...

Fixing apparent conflict from last merge

    • -20
    • +10
    ./packages/acs-tcl/tcl/apm-procs.tcl
fixed key generation

Added some additional documentation supplied by Michael Yoon ...

fixed broken call to get_workspace_portal_id

Committed Vinod Kurup's patch #1502 which fixed a file-storage bug.

Merged with the 4.5 branch (oacs-4-5 tag "don-merge-1")

    • -1
    • +1
    ./contrib/obsolete-packages/bboard/www/index.adp
    • -3
    • +4
    ./contrib/obsolete-packages/bboard/www/master.adp
    • -1
    • +11
    ./packages/acs-admin/www/apm/packages-install.tcl
    • -1
    • +1
    ./packages/acs-admin/www/users/one.xql
    • -2
    • +2
    ./packages/acs-admin/www/users/user-add-2.tcl
    • -7
    • +6
    ./packages/acs-admin/www/users/user-add-2.xql
    • -1
    • +12
    ./packages/acs-api-browser/www/index.adp
  1. … 44 more files in changeset.
minor fixes

    • -1
    • +0
    ./packages/dotlrn/tcl/dotlrn-procs.tcl
A preliminary version of "ad_form"

    • -0
    • +419
    ./packages/acs-tcl/tcl/form-processing-procs.tcl
    • -0
    • +10
    ./packages/acs-tcl/tcl/form-processing-procs.xql
Fixed more date and currency bugs, for the most part

    • -14
    • +39
    ./packages/acs-templating/tcl/date-procs.tcl
confirm-button - useful in confirm pages used with the form builder and

especially the forthcoming "ad_form" wrapper proc.

coddo.adp and plain.adp are sample form templates

    • -0
    • +104
    ./packages/acs-templating/resources/forms/coddo.adp
file coddo.adp was initially added on branch oacs-4-5.

    • -0
    • +0
    ./packages/acs-templating/resources/forms/coddo.adp
file plain.adp was initially added on branch oacs-4-5.

    • -0
    • +0
    ./packages/acs-templating/resources/forms/plain.adp
file confirm-button.tcl was initially added on branch oacs-4-5.

    • -0
    • +0
    ./packages/acs-templating/resources/forms/confirm-button.tcl
file confirm-button.adp was initially added on branch oacs-4-5.

    • -0
    • +0
    ./packages/acs-templating/resources/forms/confirm-button.adp
removing some ns_log statements

standardized portal::add_element_to_region and portal::add_element procs to take page_name instead of page_id; standardized add_self_to_page calls

    • -6
    • +3
    ./packages/dotlrn/tcl/community-procs.tcl
    • -9
    • +9
    ./packages/dotlrn/tcl/site-nodes-procs.tcl
    • -5
    • +5
    ./packages/dotlrn/tcl/site-nodes-procs.xql
  1. … 40 more files in changeset.
Fixed the long-annoying "Your Workspace" page's navigation - there's now a

link back to the home page.

    • -37
    • +2
    ./packages/acs-tcl/tcl/navigation-procs.tcl
fixed delete multiple occurences

    • -4
    • +1
    ./packages/calendar/www/cal-item-view.adp
added scoping of items

added scoping of portlets

added scoping

dont need this

    • -76
    • +102
    ./packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
    • -15
    • +0
    ./packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql
bug fixes to remove_element

    • -5
    • +5
    ./packages/new-portal/tcl/portal-procs.tcl
typo fix

fixup remove_applet_from_community

Added 3 procs to applet contract and impls. Infrastructure for getting rid of dummy_comm_p, cloning, and community deleting

  1. … 10 more files in changeset.
fix param

minor fixes for missing titles, params

    • -2
    • +5
    ./packages/fs-portlet/tcl/fs-portlet-procs.tcl
    • -1
    • +4
    ./packages/new-portal/tcl/portal-procs.tcl
reverting