lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2600: Committed missing changes for Paint plugin.

LDEV-2562 Summary page in Learner shows other people's submissions now

*merge from lams2_3_release

LDEV-2597 added Ability to export course gradebook into excel

*merge from lams2_3_release

    • -0
    • +7
    /lams_gradebook/web/gradebookCourseMonitor.jsp
LDEV-2577: Readded Paint plugin.

    • binary
    /lams_central/web/ckeditor/plugins/paint/CK Paint.swf
    • -0
    • +64
    /lams_central/web/ckeditor/plugins/paint/content.jsp
    • binary
    /lams_central/web/ckeditor/plugins/paint/icon.png
    • -0
    • +22
    /lams_central/web/ckeditor/plugins/paint/lang/en.js
    • -0
    • +43
    /lams_central/web/ckeditor/plugins/paint/plugin.js
    • -0
    • +5
    /lams_central/web/ckeditor/plugins/paint/swfobject.js
LDEV-2577: Removed some unnecessary code.

    • -2
    • +1
    /lams_tool_wiki/web/wikilink/plugin.js
LDEV-2577: Added a new version of equation plugin. This version requires a connection to the plugin's home page.

    • binary
    /lams_central/web/ckeditor/plugins/equation_html/equation.gif
LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

    • -17
    • +26
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
  1. … 14 more files in changeset.
LDEV-2587

Uploading e-Adventure project to head

    • -0
    • +15
    /lams_tool_eadventure/.classpath
    • -0
    • +3
    /lams_tool_eadventure/.cvsignore
    • -0
    • +43
    /lams_tool_eadventure/.project
    • -0
    • +60
    /lams_tool_eadventure/axisclient.properties
    • -0
    • +71
    /lams_tool_eadventure/axisservice.properties
    • -0
    • +25
    /lams_tool_eadventure/build.properties
    • -0
    • +509
    /lams_tool_eadventure/build.xml
    • -0
    • +1
    /lams_tool_eadventure/conf/hibernate/mappings/.cvsignore
    • -0
    • +4
    /lams_tool_eadventure/conf/jar/META-INF/MANIFEST.MF
    • -0
    • +198
    /lams_tool_eadventure/conf/language/lams/ApplicationResources.properties
    • -0
    • +215
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +171
    /lams_tool_eadventure/conf/language/rams/ApplicationResources.properties
    • -0
    • +171
    /lams_tool_eadventure/conf/language/rams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_eadventure/conf/war/META-INF/MANIFEST.MF
  1. … 236 more files in changeset.
LDEV-2579 saving conditionList when editing activity in monitor

LDEV-2524 fixed jsps from HEAD branch

*it also includes fix for expanding window on adding new questions.

which is caused by CKEditor and this fix should be removed once CKeditor will start working correct

LDEV-2489 Added a checkbox to the configure learners/staff popup that will check/uncheck all other boxes. Also investigated sorting and paging of the table.

*merge from lams2_3_release

Merging changes from 2.3 release branch for LDEV-2524.

  1. … 15 more files in changeset.
Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

LDEV-2481 fixing charset conversion

*merge from lams2_3_release

LDEV-2573 subFolders within the Public Folders are going to be public as well

*merge from lams2_3_release

LDEV-2568 Q&A export portfolio to include teacher's comments

*merge from lams2_3_release

    • -12
    • +15
    /lams_tool_laqa/web/export/exportportfolio.jsp
Updating English, Spanish(ES)

Updating German

Adding Spanish Mexico

    • -0
    • +221
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_MX.properties
Adding Slovenian, Catalan

    • -0
    • +221
    /lams_tool_forum/conf/language/lams/ApplicationResources_ca_ES.properties
    • -0
    • +221
    /lams_tool_forum/conf/language/lams/ApplicationResources_sl_SI.properties
LDEV-1743 fixing problem with NULL sequence_id

*merge from lams2_3_release

LDEV-2577: Changed position of dialogs from "fixed" to "absolute" to display them properly in iframes.

    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
LDEV-2595: An attempt to fix overflowing of viewable screen by CKEditor: reduced width of the initial textarea.

LDEV-2595: CKEditor needs an HTML element ID to recognise which div/textfield to replace. Changed ambiguous naming in Noticeboard tool - two elements had name "content".

    • -25
    • +20
    /lams_tool_nb/web/WEB-INF/web.xml
LDEV-2523 Trim lesson name to 254 characters

LDEV-2545 Deliver email messages to students/teachers on forum postings

*merge from lams2_3_release

    • -2
    • +4
    /lams_tool_forum/db/sql/create_lams_tool_forum.sql
LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

    • -1
    • +2
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 22 more files in changeset.
LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 10 more files in changeset.