lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-1969

Moved createId and createMultiUserChat from the chat tool to lams_common

Updating language files and confinguration files

LDEV-1951 - Block images and insert link in learner from advanced options

    • -168
    • +144
    /lams_tool_wiki/web/pages/authoring/basic.jsp
    • -274
    • +258
    /lams_tool_wiki/web/pages/learning/wiki.jsp
LDEV-1966 Implemented a special workspace folder for each session of the wiki

Monitor and learner modules adjuested to point to this folder

Export portfolio adjusted to export folder images and point to the correct location

    • -2
    • +2
    /lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
    • -4
    • +4
    /lams_tool_wiki/db/sql/table-schema.sql
Formatted code.

Adding reflection to export portfolio

Fixing reflection in learning

changed call to parent window to: wikiArray = window.top.opener.parent.wikiLinkArray;

wikiArray = window.top.opener.top.wikiLinkArray; was not working in learner because of the frames

LDEV-1954 Do export portfolio

Done for teacher.

Also fixed problem with grouping causing wiki pages to be copied for each new group.

    • -0
    • +241
    /lams_tool_wiki/web/pages/export/exportPortfolioTeacher.jsp
LDEV-1954 Do export portfolio

Learner done using a special export page. Wiki pages are separated into divs, and are displayed/blocked using javascript

    • -0
    • +107
    /lams_tool_wiki/web/pages/export/exportPortfolioLearner.jsp
Fixed bug introduced by import/export. Now all new instance or copies of wiki content use the same method so we can maintain stability and have shorter code

LDEV-1955 - Doing export tool content for wiki tool

LDEV-1657 Fixed the problem with commas and inverted commas by replacing with escape characters.

    • -2
    • +2
    /lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
    • -6
    • +5
    /lams_tool_wiki/web/pages/authoring/basic.jsp
LDEV-1657 Fixed the problem with commas and inverted commas by replacing with escape characters. Also, the comma problem is solved by getting the javascript object directly from the window rather than saving it as a string in a hidden field, like so:

wikiArray = window.top.opener.top.wikiLinkArray;

LDEV-1958 introducing the first scratch of the image gallery tool

    • -0
    • +22
    /lams_tool_images/.classpath
    • -0
    • +3
    /lams_tool_images/.cvsignore
    • -0
    • +56
    /lams_tool_images/.project
    • -0
    • +25
    /lams_tool_images/build.properties
    • -0
    • +514
    /lams_tool_images/build.xml
    • -0
    • +1
    /lams_tool_images/conf/hibernate/mappings/.cvsignore
    • -0
    • +3
    /lams_tool_images/conf/jar/META-INF/MANIFEST.MF
    • -0
    • +180
    /lams_tool_images/conf/language/lams/ApplicationResources.properties
    • -0
    • +183
    /lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +171
    /lams_tool_images/conf/language/rams/ApplicationResources.properties
    • -0
    • +171
    /lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_images/conf/war/META-INF/MANIFEST.MF
    • -0
    • +8
    /lams_tool_images/conf/xdoclet/global-exceptions.xml
    • -0
    • +6
    /lams_tool_images/conf/xdoclet/global-forwards.xml
  1. … 179 more files in changeset.
LDEV-1952 implement tool output for wiki tool

number of edits,

number of adds

    • -1
    • +2
    /lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
    • -0
    • +18
    /lams_tool_wiki/db/sql/table-schema.sql
    • -2
    • +4
    /lams_tool_wiki/db/sql/tool_insert.sql
LDEV-1956 Do reflection for wiki

Reflection done in monitor and learner

    • -0
    • +1
    /lams_tool_wiki/web/common/taglibs.jsp
    • -0
    • +33
    /lams_tool_wiki/web/pages/learning/notebook.jsp
    • -0
    • +67
    /lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
    • -0
    • +13
    /lams_tool_wiki/web/pages/learning/wiki.jsp
LDEV-1611 and LDEV-1953 Monitor and learner modules completed for wiki tool, apart from reflection, see LDEV-1954

    • -2
    • +3
    /lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
    • -15
    • +1
    /lams_tool_wiki/db/sql/table-schema.sql
  1. … 9 more files in changeset.
LDEV-1891: Added code that sends notifications to all monitoring teachers, not only those who started monitoring the chosen tool.

  1. … 6 more files in changeset.
LDEV-1950: Learner can no longer choose two groups using browser navigation.

LDEV-1657 - Updating the wiki link plugin for the fckeditor.

To attempt to resolve issues with certain browsers, I removed any ajax calls to get the list of wiki links. Instead, they are retrieved from the opening page. ie a javascript array of wikilinks is created on the page where the fckeditor is, then it is retrieved by the plugin with the following command:

wikiArray = window.top.opener.top.document.getElementById("wikiLinks").value.split(',');

LDEV-1925 Added support for complex conditions

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
LDEV-1941

Fixed maxAttendeeMikes

First commit for new wiki tool

Progress: Author finished

Learner begun

    • -0
    • +15
    /lams_tool_wiki/.classpath
    • -0
    • +4
    /lams_tool_wiki/.cvsignore
    • -0
    • +12
    /lams_tool_wiki/.project
    • -0
    • +3
    /lams_tool_wiki/.settings/com.genuitec.eclipse.j2eedt.core.prefs
    • -0
    • +4
    /lams_tool_wiki/.settings/org.eclipse.core.resources.prefs
    • -0
    • +12
    /lams_tool_wiki/.settings/org.eclipse.jdt.core.prefs
    • -0
    • +3
    /lams_tool_wiki/.settings/org.eclipse.jdt.ui.prefs
    • -0
    • +20
    /lams_tool_wiki/build.properties
    • -0
    • +532
    /lams_tool_wiki/build.xml
  1. … 149 more files in changeset.
Changing dimdim to be a collaborative activity

    • -1
    • +1
    /lams_tool_dimdim/db/sql/activity_insert.sql
Fixed a small bug in Daco project description file.

LDEV-1857

Added label to text area

LDEV-1930 Minor fixes for some labels not appearing properly in competence editor

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
LDEV-1825: Change in order: activities from DTO are parsed first. This way we can check for the activities with unwanted elements (groupings, branching mappings). These elements are then removed from DTO so they don't get into XML.

LDEV-1934 Made "View Competences Dialog" 100px wider by default

    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf