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

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

    • -0
    • +81
    ./catalog/evaluation-portlet.it_IT.ISO-8859-1.xml
    • -33
    • +101
    ./tcl/evaluation-portlet-procs.tcl
    • -584
    • +765
    ./tcl/test/evaluation-portlet-procs.tcl
    • -1
    • +1
    ./www/evaluation-evaluations-portlet-postgresql.xql
  1. … 8091 more files in changeset.
file evaluation-portlet.it_IT.ISO-8859-1.xml was initially added on branch oacs-5-10.

    • -0
    • +0
    ./catalog/evaluation-portlet.it_IT.ISO-8859-1.xml
Add doc to public procs (fixes automated tests), uniform doc style, remove duplicated portlet definition

    • -83
    • +33
    ./tcl/evaluation-portlet-procs.tcl
Make tclwebtest procs private (fixes automated tests)

  1. … 3 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.
Fix typos

    • -2
    • +2
    ./tcl/test/evaluation-portlet-procs.tcl
  1. … 69 more files in changeset.
Fix more typos

    • -1
    • +1
    ./tcl/test/evaluation-portlet-procs.tcl
  1. … 83 more files in changeset.
merged changes from the oacs-5-9 branch and resolved conflicts

    • -1
    • +6
    ./tcl/test/evaluation-portlet-procs.tcl
    • -1
    • +1
    ./www/evaluation-assignments-portlet.adp
    • -1
    • +7
    ./www/evaluation-assignments-portlet.tcl
    • -4
    • +4
    ./www/evaluation-evaluations-portlet.adp
    • -1
    • +7
    ./www/evaluation-evaluations-portlet.tcl
  1. … 7822 more files in changeset.
- standardize argument passing to adp-includes, don't perform double i18n and double quoting

    • -1
    • +1
    ./www/evaluation-assignments-portlet.adp
    • -1
    • +1
    ./www/evaluation-evaluations-portlet.adp
  1. … 123 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

    • -3
    • +3
    ./www/evaluation-assignments-portlet.tcl
    • -4
    • +4
    ./www/evaluation-evaluations-portlet.tcl
  1. … 2541 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.
HTML strict cleanup

Remove extra HTML tags

    • -2
    • +0
    ./www/evaluation-evaluations-portlet.adp
Improve document structure

    • -14
    • +10
    ./www/evaluation-assignments-portlet.adp
    • -20
    • +8
    ./www/evaluation-evaluations-portlet.adp
Remove HTML tags from messages text

    • -17
    • +13
    ./catalog/evaluation-portlet.en_US.ISO-8859-1.xml
    • -11
    • +11
    ./catalog/evaluation-portlet.es_ES.ISO-8859-1.xml
1. Merge 2.4.1 to HEAD other than assessment, imsld, lorsm, and views.

2. Bump version numbers to 2.5.0d1.

    • -2
    • +2
    ./catalog/evaluation-portlet.de_DE.ISO-8859-1.xml
    • -2
    • +2
    ./catalog/evaluation-portlet.en_US.ISO-8859-1.xml
    • -2
    • +2
    ./catalog/evaluation-portlet.es_ES.ISO-8859-1.xml
    • -2
    • +2
    ./catalog/evaluation-portlet.es_GT.ISO-8859-1.xml
    • -2
    • +2
    ./catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml
    • -2
    • +2
    ./www/evaluation-assignments-portlet.adp
    • -1
    • +1
    ./www/evaluation-evaluations-portlet.adp
  1. … 370 more files in changeset.
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/evaluation-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.el_GR.utf-8.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml
  1. … 1296 more files in changeset.
Greek catalogs for dotlrn

    • -0
    • +24
    ./catalog/evaluation-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.
in simple mode grade_plural_name not find the defaults message key, exams, task, etc.

Merged changes to HEAD ...

    • -2
    • +3
    ./catalog/evaluation-portlet.de_DE.ISO-8859-1.xml
    • -2
    • +2
    ./catalog/evaluation-portlet.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml
    • -36
    • +37
    ./www/evaluation-evaluations-portlet.adp
  1. … 1544 more files in changeset.
file apm-callback-procs.xql was initially added on branch oacs-5-3.

    • -0
    • +0
    ./tcl/apm-callback-procs.xql
Merging dotlrn-all and dotlrn-extras from oacs-5-2

    • -1
    • +1
    ./catalog/evaluation-portlet.de_DE.ISO-8859-1.xml
    • -1
    • +3
    ./catalog/evaluation-portlet.en_US.ISO-8859-1.xml
    • -1
    • +9
    ./catalog/evaluation-portlet.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/evaluation-portlet.es_GT.ISO-8859-1.xml
    • -1
    • +48
    ./catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml
    • -1
    • +3
    ./www/evaluation-assignments-portlet.adp
    • -6
    • +8
    ./www/evaluation-evaluations-portlet.adp
  1. … 872 more files in changeset.
First shot at merging oacs-5-2 apps used in .LRN to HEAD.

    • -3
    • +1
    ./catalog/evaluation-portlet.de_DE.ISO-8859-1.xml
    • -17
    • +43
    ./catalog/evaluation-portlet.en_US.ISO-8859-1.xml
    • -3
    • +26
    ./catalog/evaluation-portlet.es_ES.ISO-8859-1.xml
    • -2
    • +1
    ./catalog/evaluation-portlet.es_GT.ISO-8859-1.xml
    • -0
    • +30
    ./catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml
    • -1
    • +92
    ./lib/evaluations-chunk-postgresql.xql
    • -0
    • +9
    ./tcl/evaluation-portlet-procs-oracle.xql
  1. … 2464 more files in changeset.
file evaluation-portlet.pt_BR.ISO-8859-1.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml
file evaluation-portlet-procs.tcl was initially added on branch oacs-5-2.

    • -0
    • +0
    ./tcl/test/evaluation-portlet-procs.tcl