• last updated 11 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
- prefer "localurl" over "return_url" as name of page_filter

  1. … 27 more files in changeset.
- add editor hints to keep spaces/tabs in the future more consistent

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

  1. … 2547 more files in changeset.
- use consistently "naturalnum" instead of "integer" when accepting just positive values

  1. … 125 more files in changeset.
- breace expressions

- used compiled instructions

- bump version number

  1. … 8 more files in changeset.
- replace deprecated "ad_require_permission" by "permission::require_permission"

  1. … 68 more files in changeset.
use content::extlink instead of the deprecated content_extlink:: api, add content::extlink::edit function

  1. … 12 more files in changeset.
Merged 4.6.4d1 (unreleased) to HEAD. This marks the end of the life of the oacs-4-6 branch.

  1. … 816 more files in changeset.
make attachments work (context was calendar events). Added item::get_type to the CR because I needed it and it didn't seem to already exist.

  1. … 5 more files in changeset.
merge of 4.6.3b1 to HEAD

  1. … 183 more files in changeset.
Removed the vile fs_simple_objects added by OF to store URLs in file

storage despite the existence of a non-versioned URL type in the content

repository. Upgrade scripts provided. I added Tcl API to the content

repository to honor our desire to export the SQL API to Tcl client code.

1. folder contents are now counted correctly (bug fix)

2. The fs_objects view is now usable in PG (it was a UNION view before and

therefore didn't scale)

3. Code in file storage is considerably simpler now and all file storage

objects are now stored in the content repository, as they should

be.

The Oracle version may need some work I'll finish testing this afternoon.

  1. … 46 more files in changeset.
I18N: made the attachments package use the message catalog

  1. … 13 more files in changeset.
made attachments work

  1. … 12 more files in changeset.