• last updated 21 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge from oacs-5-10

  1. … 8096 more files in changeset.
Cleanup trailing whitespace

  1. … 6 more files in changeset.
Fix typo

merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7832 more files in changeset.
file csp-collector.tcl was initially added on branch oacs-5-9.

    • -0
    • +0
    ./SYSTEM/csp-collector.tcl
- improve safety of HTML

  1. … 1 more file in changeset.
- provide defaults for Content-Style-Type and Content-Script-Type

  1. … 1 more file in changeset.
- include js function acs_Focus() in head such that core.js can be

added safely as body_script

- remove obsolete handling for document.getElementById()

  1. … 1 more file in changeset.
Merging back to HEAD all changes that happened in branch oacs-5-8 between tags: vg-merge-oacs-5-8-from-20141027 and vg-merge-oacs-5-8-from-20150427

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

  1. … 2544 more files in changeset.
Merged oacs-5-6 to HEAD. HEAD now installs and passes all core tests. There

may still be some lingering problems due to my screwing up the oacs-5-6

branch earlier, I'll be looking into this later.

  1. … 214 more files in changeset.
removing OpenGraph from default implementation, moving side-bar to ecommerce

  1. … 4 more files in changeset.
adding packages/acs-subsite/lib/share-bar for share links example.

  1. … 2 more files in changeset.
adding OpenGraph protocol default generations for social networking

  1. … 1 more file in changeset.
Test connectivity of all three database pools.

Non-info file merge results, with conflicts fixed

  1. … 726 more files in changeset.
file bug-tracker.adp was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/bug-tracker.adp
file metrics.tcl was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/metrics.tcl
file metrics.adp was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/metrics.adp
file info-file.tcl was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/info-file.tcl
file info-file.adp was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/info-file.adp
file bug-tracker.tcl was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/bug-tracker.tcl
Improved support for the ThemeCSS subsite param, provided the upgrade

script, and bumped the version number.

  1. … 5 more files in changeset.
Roll back Torben changes. If you use deprecated properties (e.g. title), use blank-compat instead of blank-master.

making doc(title) failthrough more forgiving.. lets show the best possible, even if only during a test evaluation

file download.adp was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/widgets/download.adp
file sponsors.adp was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/widgets/sponsors.adp
file resources.adp was initially added on branch openacs-org.

    • -0
    • +0
    ./templates/widgets/resources.adp
Merged from 5.4.2

  1. … 281 more files in changeset.
Added first cut at theming stuff, using the new package openacs-default-theme

(previously imported)

  1. … 9 more files in changeset.