• last updated 19 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Non-info file merge results, with conflicts resolved.

  1. … 203 more files in changeset.
Fix use of ns_mktemp with /tmp/ hard coded. Fix case when tmp file is not cleaned up when a string is used for a file storage type

- fix one more typo in deprecated command

Fied a typo: "-item_id $item_id" is better than "-item_id item_id'.

Fix for search implementation

typo

use content::extlink instead of the deprecated content_extlink:: api, add content::extlink::edit function

  1. … 10 more files in changeset.
remove deprecated calls to ad_parameter

  1. … 4 more files in changeset.
- remove lock statements, which seem not needed anymore with Postgres 8.2 or newer

Avoid implict binary encoding by setting encoding flag explicitly; see http://openacs.org/forums/message-view?message_id=2478560

Add proc to resize images that are already in the CR to provide thumbnail and other sizes

Merged from 5.4.2

  1. … 283 more files in changeset.
Fixed default template: only render content when it's HTML or can be converted to HTML

deactivate background_delivery for connections via nsopenssl

deactivate background_delivery for connections via nsopenssl

Added -- after switches in call to ad_html_text_convert to avoid errors when the text to convert contains hyphens

Removed Malte's "fix" to content-folder::new, and emmanuelle's fix to that

fix (which was fine), reverting to the 5.3 version because it wasn't broken

in the first place, and malte's attempt removed transaction protection

around the folder inserts (bad!) in order to avoid a pg-only deadlock in

PG 8.1 which doesn't happen in PG 8.2 or better.

Removed Malte's "fix" to content-folder new, and emmanuelle's fix to that fix

(which was fine), by rolling back to the 5.3 version (which wasn't broken in

the first place, PG 8.1 was)

default value of parent_id has to be the empty string in content::folder::new

Rolled back abortive attempt to substitute dbms_log stuff for java

  1. … 4 more files in changeset.
Set default path for binary to /usr/bin instead of /usr/local/bin

  1. … 3 more files in changeset.
Merged 5.3 to HEAD

  1. … 59 more files in changeset.
fix for bug #2812

We need to use the default here, otherwise upgrades might become an issue

Got rid of reliance on Java for Oracle. Removed unused old functions. Hopefully someone else can help with a fresh install test as well

  1. … 5 more files in changeset.
Added FileLocationRelativeP paramater in the .info file. If set to 0 it says that the location of the CRFileLocationRoot is not relative to acs_root_dir

    • -13
    • +16
    ./acs-content-repository-callback-procs.tcl
    • -10
    • +11
    ./acs-content-repository-init.tcl
  1. … 1 more file in changeset.
Support for relative file locations which might even reside on a windows drive and therefore start with d:\

    • -6
    • +16
    ./acs-content-repository-callback-procs.tcl
  1. … 4 more files in changeset.
Bug#3107 Document use of tmp_filename. The caller needs to clean up

the tmp file. The content repository does not "know" what the proper

procedure is to handle the file.

Merged the 5.3 branch with HEAD. Look for tags with the pattern

drb-*-20070513

  1. … 324 more files in changeset.
Fix tests to pass in Oracle (actually bypass the test b/c the search

triggers don't exist in oracle.)