• last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge with missing files

  1. … 1462 more files in changeset.
merge from oacs-5-10

  1. … 8096 more files in changeset.
file bm-portlet-procs.tcl was initially added on branch oacs-5-10.

    • -0
    • +0
    ./tcl/test/bm-portlet-procs.tcl
Add documentation to public procs (fixes automated tests), uniform doc style, fix typo

Fix proc and contract doc elements, so they are properly parsed by apidoc::api_*_documentation.

- @cvs_id -> @cvs-id

- @version -> @cvs-id

- @creation_date -> @creation-date

- @date -> @creation-date

- Different variations of $Id$

- Remove wrong @param entry

- Fix typos

  1. … 368 more files in changeset.
bump versions of packages with DotLRN style version numbering to HEAD numbers (2.10.0*)

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

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

    • -36
    • +43
    ./sql/postgresql/bm-portlet-create.sql
    • -8
    • +15
    ./sql/postgresql/bm-portlet-drop.sql
  1. … 2544 more files in changeset.
- bump version numbers due to branching

  1. … 28 more files in changeset.
Update dotlrn package versions to 2.6.0 for the last dotlrn release.

  1. … 42 more files in changeset.
Merged oacs-5-5 branch of .LRN packages to HEAD.

  1. … 87 more files in changeset.
1. Merge 2.4.1 to HEAD other than assessment, imsld, lorsm, and views.

2. Bump version numbers to 2.5.0d1.

  1. … 379 more files in changeset.
Remov epackage version from catalog files

    • -1
    • +1
    ./catalog/bm-portlet.en_AU.ISO-8859-1.xml
Bump version number for dotlrn packages

  1. … 43 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
    • +1
    ./catalog/bm-portlet.ast_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.eu_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.fr_FR.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.gl_ES.ISO-8859-1.xml
  1. … 1287 more files in changeset.
Greek catalogs for dotlrn

    • -0
    • +7
    ./catalog/bm-portlet.el_GR.utf-8.xml
  1. … 45 more files in changeset.
Merged oacs-5-3 branch to HEAD

  1. … 187 more files in changeset.
Merged changes to HEAD ...

    • -1
    • +1
    ./catalog/bm-portlet.ast_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.eu_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.fr_FR.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.gl_ES.ISO-8859-1.xml
  1. … 1542 more files in changeset.
Merging dotlrn-all and dotlrn-extras from oacs-5-2

    • -1
    • +1
    ./catalog/bm-portlet.ast_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.en_AU.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.eu_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.fr_FR.ISO-8859-1.xml
  1. … 868 more files in changeset.
First shot at merging oacs-5-2 apps used in .LRN to HEAD.

    • -1
    • +1
    ./catalog/bm-portlet.ast_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.de_DE.ISO-8859-1.xml
    • -0
    • +7
    ./catalog/bm-portlet.en_AU.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.en_US.ISO-8859-1.xml
    • -0
    • +7
    ./catalog/bm-portlet.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_GT.ISO-8859-1.xml
    • -0
    • +6
    ./catalog/bm-portlet.eu_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.fr_FR.ISO-8859-1.xml
  1. … 2464 more files in changeset.
file bm-portlet.eu_ES.ISO-8859-1.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./catalog/bm-portlet.eu_ES.ISO-8859-1.xml
file bm-portlet.tr_TR.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./catalog/bm-portlet.tr_TR.utf-8.xml
file bm-portlet.hi_IN.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./catalog/bm-portlet.hi_IN.utf-8.xml
remove the unused .ms_my locale files which conflict with the ms_MY on OS X and are just confusing to keep around

  1. … 36 more files in changeset.
file bm-portlet.es_CO.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./catalog/bm-portlet.es_CO.ISO-8859-1.xml
file bm-portlet.en_AU.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./catalog/bm-portlet.en_AU.ISO-8859-1.xml
commit to HEAD of merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20050111 and jcd-merge-5-1-20050224

  1. … 321 more files in changeset.
commit to HEAD of merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040724 and jcd-merge-5-1-20050111

    • -1
    • +1
    ./catalog/bm-portlet.ast_ES.ISO-8859-1.xml
    • -0
    • +7
    ./catalog/bm-portlet.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.fr_FR.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.gl_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/bm-portlet.it_IT.ISO-8859-1.xml
  1. … 2261 more files in changeset.
file bm-portlet.ca_ES.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./catalog/bm-portlet.ca_ES.ISO-8859-1.xml
file bm-portlet.ms_MY.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./catalog/bm-portlet.ms_MY.utf-8.xml