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

    • -1
    • +7
    ./plugins/OacsFs/popups/file-selector.tcl
    • -1
    • +7
    ./plugins/OacsFs/popups/insert-ilink.tcl
    • -1
    • +7
    ./plugins/OacsFs/popups/insert-image.tcl
  1. … 7831 more files in changeset.
- remove xinha from acs-templating (now in package richtext-xinha)

  1. … 1934 more files in changeset.
- remove obsolete file

    • -43
    • +0
    ./plugins/OacsFs/popups/insert-ilink.xql
- remove unneeded files

- remove unneeded files

- remove unneeded file

    • -52
    • +0
    ./plugins/ImageManager/img/Thumbs.db
- remove unneeded file

    • -52
    • +0
    ./plugins/ImageManager/img/Thumbs.db
- add editor hints to keep spaces/tabs in the furture more consistent

    • -1
    • +7
    ./plugins/OacsFs/popups/file-selector.tcl
    • -1
    • +7
    ./plugins/OacsFs/popups/insert-ilink.tcl
    • -1
    • +7
    ./plugins/OacsFs/popups/insert-image.tcl
  1. … 751 more files in changeset.
- harden page contracts

    • -2
    • +2
    ./plugins/OacsFs/popups/file-selector.tcl
  1. … 5 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

    • -4
    • +4
    ./plugins/OacsFs/popups/file-selector.tcl
    • -7
    • +3
    ./plugins/OacsFs/popups/insert-ilink.tcl
    • -3
    • +3
    ./plugins/OacsFs/popups/insert-image.tcl
  1. … 2544 more files in changeset.
- remove unneeded fiels harming debian installs

    • -52
    • +0
    ./plugins/ImageManager/img/Thumbs.db
- remove .php files to ease debian packaging

    • -23
    • +0
    ./examples/files/ext_example-dest.php
    • -357
    • +0
    ./examples/files/ext_example-menu.php
    • -110
    • +0
    ./plugins/ExtendedFileManager/backend.php
    • -172
    • +0
    ./plugins/ExtendedFileManager/editor.php
    • -420
    • +0
    ./plugins/ExtendedFileManager/images.php
    • -287
    • +0
    ./plugins/ExtendedFileManager/manager.php
  1. … 94 more files in changeset.
- use consistently "naturalnum" instead of "integer" when accepting just positive values

    • -2
    • +2
    ./plugins/OacsFs/popups/file-selector.tcl
  1. … 124 more files in changeset.
- use consistently "naturalnum" instead of "integer" when accepting just positive values

    • -2
    • +2
    ./plugins/OacsFs/popups/file-selector.tcl
    • -3
    • +3
    ./plugins/OacsFs/popups/insert-ilink.tcl
    • -3
    • +3
    ./plugins/OacsFs/popups/insert-image.tcl
  1. … 101 more files in changeset.
- normalize string expressions

    • -2
    • +2
    ./plugins/OacsFs/popups/file-selector.tcl
  1. … 12 more files in changeset.
- replace deprecated "ad_verify_and_get_user_id" by "ad_conn user_id"

    • -5
    • +1
    ./plugins/OacsFs/popups/insert-ilink.tcl
  1. … 6 more files in changeset.
- rename xinha plugin CSS to CSSDropdowns to fix potential breakage for Firefox 22 and Chome 28 as suggested by http://trac.xinha.org/ticket/1609

    • -0
    • +149
    ./plugins/CSSDropdowns/CSSDropdowns.js
Updated to Xinha nighly (Dec 3, 2012) due to reported problems with IE9

    • -2
    • +2
    ./examples/files/ext_example-body.html
    • -8
    • +12
    ./modules/InsertTable/insert_table.js
  1. … 115 more files in changeset.
removed duplicate files that caused troubles under Mac OS X. For some reason, serveral files existed with uppercase and lowercase names, where the latter was a previous converntion in Xinha. cvs on Mac OS X reported "cvs update: move away ...; it is in the way" even on new checkouts

    • -153
    • +0
    ./plugins/Abbreviation/abbreviation.js
    • -237
    • +0
    ./plugins/DynamicCSS/dynamiccss.js
- updated Xinha to 0.96.1 (released on 12th May 2010 NZST) .... we seem to need multiple commits nowadays...

  1. … 38 more files in changeset.
- updated Xinha to 0.96.1 (released on 12th May 2010 NZST)

    • -0
    • +99
    ./contrib/compress.php
    • -0
    • +107
    ./contrib/compress_yui.php
    • -0
    • +178
    ./contrib/lc_merge_strings.php
    • -0
    • +61
    ./contrib/test_server.py
    • binary
    ./contrib/yuicompressor-2.4.2.jar
  1. … 263 more files in changeset.
- Update of xinha to 0.96 Phoenix beta2 (needed for IE8)

    • -5
    • +5
    ./examples/files/ext_example-body.html
  1. … 110 more files in changeset.
renamed plugins/OacsFs/oacs-fs.js to plugins/OacsFs/OacsFs.js in according to the new plugin naming of xinha (the old continues to work, but produces a warning)

    • -0
    • +349
    ./plugins/OacsFs/OacsFs.js
Xinha 0.96b (Phoenix), part 2

    • binary
    ./iconsets/Classic/de/bold.gif
    • binary
    ./iconsets/Classic/de/italic.gif
    • binary
    ./iconsets/Classic/de/underline.gif
    • binary
    ./iconsets/Classic/fr/bold.gif
    • binary
    ./iconsets/Classic/fr/strikethrough.gif
    • binary
    ./iconsets/Classic/fr/underline.gif
    • -0
    • +121
    ./iconsets/Crystal/LICENSE
    • -0
    • +3
    ./iconsets/Crystal/README
    • binary
    ./iconsets/Crystal/ed_buttons_main.png
    • -0
    • +234
    ./iconsets/Crystal/iconset.xml
    • -0
    • +67
    ./iconsets/Tango/LICENSE
    • -0
    • +3
    ./iconsets/Tango/README
    • binary
    ./iconsets/Tango/ed_buttons_main.png
    • -0
    • +233
    ./iconsets/Tango/iconset.xml
    • binary
    ./images/ed_buttons_main.png
  1. … 244 more files in changeset.
Xinha 0.96b (Phoenix)

    • -0
    • +5992
    ./XinhaConfig.js
    • binary
    ./iconsets/Classic/ed_buttons_main.gif
    • binary
    ./iconsets/Classic/ed_charmap.gif
    • binary
    ./iconsets/Classic/ed_selectall.gif
    • -0
    • +263
    ./iconsets/Classic/iconset.xml
remove deprecated calls to ad_parameter

    • -12
    • +12
    ./plugins/OacsFs/popups/file-selector.tcl
  1. … 6 more files in changeset.
- extend OacsFS plugin to insert wiki links, if wiki_p is specified

- handle passing of wiki_p

    • binary
    ./plugins/OacsFs/img/insert-wlink.gif
  1. … 2 more files in changeset.
- fix handling of script_dir for xinha

Merged from 5.4.2

    • -0
    • +206
    ./examples/files/ext_example-body.html
    • -0
    • +23
    ./examples/files/ext_example-dest.php
    • -0
    • +357
    ./examples/files/ext_example-menu.php
  1. … 275 more files in changeset.
Upgrade to Xinha 0.95

    • -136
    • +53
    ./examples/simple_example.html
  1. … 167 more files in changeset.