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

    • -2
    • +16
    ./acs-templating.en_US.ISO-8859-1.xml
    • -0
    • +11
    ./acs-templating.es_ES.ISO-8859-1.xml
    • -0
    • +15
    ./acs-templating.it_IT.ISO-8859-1.xml
  1. … 8096 more files in changeset.
Localize filter clearing

  1. … 1 more file in changeset.
Update es_ES translation

  1. … 3 more files in changeset.
Update italian translation

  1. … 3 more files in changeset.
add text/markdown to the accepted text formats of the richtext widget and ad_html_text_convert

  1. … 5 more files in changeset.
merged changes from the oacs-5-9 branch and resolved conflicts

    • -1
    • +37
    ./acs-templating.de_DE.ISO-8859-1.xml
    • -0
    • +86
    ./acs-templating.it_IT.ISO-8859-1.xml
  1. … 7833 more files in changeset.
- update of russian catalog files as contributed by v v (see issue #3265)

    • -14
    • +100
    ./acs-templating.ru_RU.utf-8.xml
Added missing spanish translations

  1. … 7 more files in changeset.
- extend OacsFS plugin to insert wiki links, if wiki_p is specified

- handle passing of wiki_p

    • -28
    • +5
    ./acs-templating.en_US.ISO-8859-1.xml
  1. … 3 more files in changeset.
Remove version numbers from catalog files

    • -4
    • +28
    ./acs-templating.en_US.ISO-8859-1.xml
Merged from 5.4.2

  1. … 283 more files in changeset.
Import of message keys from translation server for core and .LRN packages.

This catalogs have no package version info. Check http://openacs.org/forums/message-view?message%5fid=1007666

  1. … 1287 more files in changeset.
Greek and spanish catalogs without version number (applying Don's change)

  1. … 18 more files in changeset.
More greek translations

Removed version info from catalog file code as was TIP'd ages ago, which

will make merging much easier in the future. I had en_US and de_DE installed

so the catalogs for these languages in core have been exported and don't

have version numbers. The rest of the packages and locales for core and

dotlrn will be exported from the translation server as part of our release

process and will get fixed up then.

  1. … 16 more files in changeset.
Spanish translation

  1. … 5 more files in changeset.
Merged the 5.3 branch with HEAD. Look for tags with the pattern

drb-*-20070513

    • -1
    • +11
    ./acs-templating.en_US.ISO-8859-1.xml
    • -1
    • +20
    ./acs-templating.es_ES.ISO-8859-1.xml
  1. … 310 more files in changeset.
file acs-templating.el_GR.utf-8.xml was initially added on branch oacs-5-3.

    • -0
    • +0
    ./acs-templating.el_GR.utf-8.xml
Add keys for file and image uload widgets

First round of oacs-5-3 merge to HEAD commits

    • -0
    • +42
    ./acs-templating.de_DE.ISO-8859-1.xml
    • -0
    • +90
    ./acs-templating.gl_ES.ISO-8859-1.xml
    • -0
    • +90
    ./acs-templating.nl_ZA.ISO-8859-1.xml
    • -0
    • +57
    ./acs-templating.pt_BR.ISO-8859-1.xml
  1. … 92 more files in changeset.
file acs-templating.cs_CZ.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./acs-templating.cs_CZ.utf-8.xml
file acs-templating.nl_ZA.ISO-8859-1.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./acs-templating.nl_ZA.ISO-8859-1.xml
file acs-templating.gl_ES.ISO-8859-1.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./acs-templating.gl_ES.ISO-8859-1.xml
Add new message keys for image/file attachments.

New messages for image/file popup

Bumped the acs-core world (including catalog files) to 5.3.0d1.

  1. … 204 more files in changeset.
Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.

TODO:

1. Bump acs-core package version numbers to 5.3.0d1

2. Would be nice to do a test install, wouldn't it?

    • -2
    • +10
    ./acs-templating.de_DE.ISO-8859-1.xml
    • -0
    • +33
    ./acs-templating.en_AU.ISO-8859-1.xml
    • -1
    • +58
    ./acs-templating.en_US.ISO-8859-1.xml
    • -0
    • +33
    ./acs-templating.es_CO.ISO-8859-1.xml
    • -1
    • +58
    ./acs-templating.es_ES.ISO-8859-1.xml
    • -1
    • +13
    ./acs-templating.it_IT.ISO-8859-1.xml
  1. … 707 more files in changeset.
file acs-templating.tr_TR.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./acs-templating.tr_TR.utf-8.xml
file acs-templating.ru_RU.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./acs-templating.ru_RU.utf-8.xml
file acs-templating.pa_IN.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./acs-templating.pa_IN.utf-8.xml