• last updated 6 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.
- remove obsolete files

  1. … 14 more files in changeset.
- prefer sql statements between curly braces

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

  1. … 754 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.
- improve page contracts

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

  1. … 103 more files in changeset.
- flatten nested lindex-structures

- use single "lassign" instead of multiple "lindex" operations

  1. … 4 more files in changeset.
- normalize string expressions

  1. … 12 more files in changeset.
Set f_title with file_name. We set the element value at the end

Non-info file merge results, with conflicts fixed

  1. … 726 more files in changeset.
Remove debugging alert statement committed in error

Fix handling of link text in oacslink plugin. Trim spaces off filename

  1. … 1 more file in changeset.
Make sure xinha body handler loads

Remove zoom plugin. Fix permissions on file plugin on xinha

  1. … 1 more file in changeset.
Fix unquoted [] in javascript

Update for 5.5.

Add template::head

Conditionally support ajax image chooser.

Support tinymce 3

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

  1. … 6 more files in changeset.
Add tinymce support to attach image and attach file widgets.

  1. … 3 more files in changeset.
Make sure f_href is set so the javascript can pass the link back

to xinha.

Fix insert of file links.

Add filename for insert image links

  1. … 3 more files in changeset.
Check permissions on package_id if object doesn't exist yet.

Handle private images more intelligently

  1. … 3 more files in changeset.
Strip item_id from name for display

  1. … 1 more file in changeset.
Make comment correct.

Add recent file pickeer

  1. … 1 more file in changeset.
Use file specific handler

Add title label

  1. … 1 more file in changeset.
Use a similar dialog for attaching links to files (and uploading the files).

The logic was too complex to support both in one file, this is alot easier to understand and debug.

  1. … 3 more files in changeset.
Add reusable includes for xinha popups

    • -0
    • +145
    ./attach-file.tcl
  1. … 11 more files in changeset.