• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2394 solved the problem with getting flicked back up to the FCK editor for the question text

merge HEAD into lams2_3_release branch

    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
LDEV-2394 solved the problem with getting flicked back up to the FCK editor for the question text

    • -2
    • +2
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
LDEV-2114 improving learning design (affects only IE)

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 95 more files in changeset.
LDEV-2387 Changed rendering of FCKEditor in Assessment and Notebook tool

* removed commented script part from FCKEditor.tag

* removed all references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 3 more files in changeset.
LDEV-2392 Wrong work of thickbox in Assessment tool fixed

rolled back to the previous version of thickbox.js + jQuery.browser.version bug fixed

    • binary
    ./includes/images/loadingAnimation.gif
more merging lams2_3 into head

  1. … 39 more files in changeset.
Merge lams2_3 into head

  1. … 162 more files in changeset.
Merge lams2_3_jboss5 changes into lams2_3

  1. … 57 more files in changeset.
Undo-ing some changes to return to 2.3 branch

    • binary
    ./includes/images/loadingAnimation.gif
    • -0
    • +332
    ./includes/javascript/thickbox.js
  1. … 6 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

    • binary
    ./includes/images/loadingAnimation.gif
    • -332
    • +0
    ./includes/javascript/thickbox.js
  1. … 6 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 16 more files in changeset.
New icon LDEV-2351

New icon LDEV-2351

New logo

LDEV-2351 Committing the assessment tool icon

*** empty log message ***

New logo

LDEV-2071: Removed gnujaxp library as it causes parsing errors. Changed tags in web.xml file in Assessment tool.

  1. … 1 more file in changeset.
LDEV-2071: Added initial version of LAMS 2.3 on JBoss 5.1.

  1. … 10 more files in changeset.
LDEV-2152: next activity icon

LDEV-2195 No content editing after first learner used accessed activity

* also defineLater fixed

    • -11
    • +13
    ./pages/monitoring/editactivity.jsp
  1. … 5 more files in changeset.
LDEV-2104 Implement Assessment Tool

some small fixes:

* changed the grid theme to blue

* move the numbers to the top of the column rather than sitting in

the middle.... also put them in bold

* Summary and Report by question headings

  1. … 8 more files in changeset.
LDEV-2169 Monitoring

* "next activity" action modified

* refresh summary page only if teacher indeed made some modifications

* export in xls files

* changed the design of summary page

* applicationResources cleaned up

    • -2
    • +8
    ./pages/monitoring/parts/questionsummary.jsp
    • -4
    • +18
    ./pages/monitoring/parts/usersummary.jsp
  1. … 13 more files in changeset.
LDEV-2169 Monitoring

* master details tabl improved

* fixed representation for the "matching pairs" answers

* adjust assessment tool to Marcin's changes

    • -1
    • +3
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -2
    • +0
    ./pages/monitoring/parts/questionsummary.jsp
    • -21
    • +22
    ./pages/monitoring/parts/userresponse.jsp
    • -1
    • +1
    ./pages/monitoring/parts/usersummary.jsp
  1. … 5 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 117 more files in changeset.
LDEV-2169 Monitoring

* tool outputs

* export portfolio

* fixing bugs

* user master detail

    • -217
    • +15
    ./pages/export/exportportfolio.jsp
    • -0
    • +158
    ./pages/export/parts/exportlearner.jsp
    • -0
    • +234
    ./pages/export/parts/exportteacher.jsp
    • -0
    • +62
    ./pages/export/parts/userresponse.jsp
    • -0
    • +19
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -3
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
    • -2
    • +2
    ./pages/monitoring/parts/usersummary.jsp
  1. … 23 more files in changeset.
LDEV-2169 Monitoring

* question summary

* statistic

* fixed bug with contentId

* refreshing of the summary page

    • -67
    • +21
    ./pages/monitoring/statistic.jsp
    • -54
    • +69
    ./pages/monitoring/parts/questionsummary.jsp
    • -6
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  1. … 6 more files in changeset.
LDEV-2169 Monitoring

* grade's editing

* several bugs fixed

* most of question summary

    • -0
    • +188
    ./pages/monitoring/parts/questionsummary.jsp
    • -8
    • +8
    ./pages/monitoring/parts/userresponse.jsp
    • -4
    • +25
    ./pages/monitoring/parts/usersummary.jsp
  1. … 12 more files in changeset.
LDEV-2169 Monitoring

* fix for a quatation in question titles

    • -4
    • +7
    ./pages/monitoring/parts/usersummary.jsp
  1. … 1 more file in changeset.