lams-github

lams_tool_laqa

Clone Tools

Stats

Commits this week: 0
Total Committers: 29
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 02 Nov 2010
1:26 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./web/authoring/BasicContent.jsp
    • -9
    • +0
    ./web/authoring/editQuestionBox.jsp
    • -18
    • +2
    ./web/authoring/newQuestionBox.jsp
Monday 01 Nov 2010
1:27 pm

fmalikoff

Merging changes from 2.3 release branch for LDEV-2524.

Options
    • -1
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
    • -0
    • +10
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
    • -0
    • +1
    ./db/sql/create_lams_tool_qa.sql
    • -0
    • +9
    ./db/sql/updatescripts/updateTo20101022.sql
    • -21
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
    • -17
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
    • -26
    • +22
    ./src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
    • -1
    • +32
    ./src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
    • -11
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
    • -102
    • +43
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -11
    • +6
    ./src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
  16. … 15 more files in changeset.
1:19 pm

fmalikoff

Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

Options
    • -1
    • +1
    ./build.properties
    • -32
    • +96
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
Friday 29 Oct 2010
5:05 pm

Andrey Balan

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

*merge from lams2_3_release

Options
    • -4
    • +19
    ./src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
    • -12
    • +15
    ./web/export/exportportfolio.jsp
Sunday 24 Oct 2010
3:39 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Thursday 21 Oct 2010
8:57 pm

Marcin Cieslak

LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 24 more files in changeset.
Sunday 10 Oct 2010
1:48 pm

Marcin Cieslak

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
12:18 pm

Marcin Cieslak

LDEV-2577 The new CKEditor does not have Java Integration library (yet). We have been using it to: a) get the tag library to create our own tag <lams:FCKeditor> But the new CKEditor uses AJAX to get the contents, so the library is not needed anymore. The references to it has been deleted from every tool. FCKEditor.tag has been rewritten to use the new syntax. b) get a FCKEditor internal file manager by a Connector from the jar The new CKEditor does not provide a file manager - the license became commercial and the whole thing became a separate project, CKFinder. There were alternatives suggested on the web: jasfinder - http://sourceforge.net/projects/jasfinder/support kcfinder - http://kcfinder.sunhater.com/ some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/ but we have already nicely integrated with the old file manager. This page: http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/ in polish says how to use the file manager from the old FCKEditor. The steps that have to be done: - download the new CKEditor - download the old FCKEditor - copy the filemanager to ckeditor directory - in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to: window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' ); - in the file browser/default/browser.html add in line 80: document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

Options
    • -5
    • +1
    ./test/web/WEB-INF/web.xml
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -5
    • +1
    ./web/WEB-INF/web.xml
    • -2
    • +2
    ./web/authoring/BasicContent.jsp
    • -2
    • +2
    ./web/authoring/editQuestionBox.jsp
    • -3
    • +3
    ./web/authoring/newQuestionBox.jsp
    • -6
    • +6
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/includes/taglibs.jsp
    • -4
    • +3
    ./web/learning/CombinedAnswersContent.jsp
    • -4
    • +3
    ./web/learning/SequentialAnswersContent.jsp
    • -2
    • +2
    ./web/monitoring/editQuestionBox.jsp
  16. … 1082 more files in changeset.
Thursday 10 Jun 2010
2:44 am

lfoxton

LDEV-2552 MErging changes with head

Options
    • -2
    • +1
    ./web/authoring/BasicContent.jsp
    • -1
    • +1
    ./web/authoring/newQuestionBox.jsp
Thursday 18 Mar 2010
1:59 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Friday 05 Mar 2010
4:16 am

jliew

LDEV-2526 merged from branch

Options
    • -17
    • +36
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
Wednesday 20 Jan 2010
3:00 pm

Andrey Balan

LDEV-2498 Increased the width for Q&A iframe

Options
    • -1
    • +1
    ./web/authoring/BasicContent.jsp
Tuesday 17 Nov 2009
7:14 am

jliew

LDEV-2466 use native id generator

Options
    • -1
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
Friday 13 Nov 2009
4:14 am

jliew

LDEV-2459 use double quotes when enclosing i18n text in javascript

Options
    • -15
    • +15
    ./web/admin/config.jsp
    • -1
    • +1
    ./web/authoring/newQuestionBox.jsp
    • -2
    • +2
    ./web/includes/jsp/qaWizardCommon.jsp
    • -1
    • +1
    ./web/learning/AnswersContent.jsp
  5. … 44 more files in changeset.
Monday 09 Nov 2009
7:48 am

jliew

translation update

Options
    • -101
    • +166
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
Wednesday 16 Sep 2009
10:23 am

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +3
    ./web/learning/IndividualLearnerResults.jsp
    • -3
    • +3
    ./web/learning/LearnerRep.jsp
6:03 am

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -4
    • +4
    ./web/learning/Notebook.jsp
4:04 am

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./web/learning/IndividualLearnerResults.jsp
    • -2
    • +2
    ./web/learning/LearnerRep.jsp
    • -7
    • +5
    ./web/learning/Notebook.jsp
    • -1
    • +1
    ./web/learning/RevisitedLearnerRep.jsp
    • -3
    • +3
    ./web/learning/RunOffline.jsp
  6. … 6 more files in changeset.
Friday 28 Aug 2009
6:00 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -11
    • +11
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 2 more files in changeset.
Sunday 02 Aug 2009
10:15 pm

Marcin Cieslak

LDEV-2374: Added outputs for Data Flow for: * Image gallery (URL to the images uploaded by the students), * Forum (text for the postings for a student in the forum) * Chat (all text postings for a student in the chat) * Pixlr (URL to the image) * Share resources (URL to file/urls uploaded) * Notebook (Text entered by the student) * Submit Files (URL to files uploaded)

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
  3. … 31 more files in changeset.
Wednesday 29 Jul 2009
8:13 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -40
    • +40
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 22 more files in changeset.
Tuesday 28 Jul 2009
4:20 pm

Andrey Balan

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

Options
    • -23
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -5
    • +0
    ./web/common/fckeditorheader.jsp
    • -1
    • +0
    ./web/common/header.jsp
    • -1
    • +0
    ./web/common/tabbedheader.jsp
    • -2
    • +0
    ./web/monitoring/LearnerRep.jsp
  7. … 92 more files in changeset.
Monday 27 Jul 2009
12:21 am

Marcin Cieslak

LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

Options
    • -37
    • +62
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
  3. … 48 more files in changeset.
Tuesday 14 Jul 2009
2:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
Tuesday 07 Jul 2009
2:52 am

jliew

change to ascii

Options
    • -784
    • +784
    ./db/model/lams_tool_qa.clay
    • -75
    • +75
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql
    • -15
    • +15
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20081126_updateFrom22.sql
  4. … 47 more files in changeset.
Saturday 04 Jul 2009
9:53 am

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, Japanese, Norwegian

Options
    • -8
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -17
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +5
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -65
    • +135
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
Thursday 02 Jul 2009
3:06 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -39
    • +113
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
    • -96
    • +71
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
  5. … 82 more files in changeset.
10:19 am

jliew

Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

Options
    • -1
    • +7
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
    • -0
    • +1
    ./db/sql/create_lams_tool_qa.sql
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
    • -2
    • +14
    ./src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
    • -10
    • +12
    ./src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20081126_updateFrom22.sql
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
    • -2
    • +6
    ./web/WEB-INF/web.xml
    • -1
    • +8
    ./web/authoring/AdvancedContent.jsp
    • -2
    • +2
    ./web/authoring/addCondition.jsp
  16. … 153 more files in changeset.
Wednesday 01 Jul 2009
4:19 pm

Marcin Cieslak

Added missing library and fixed classpaths - changes needed after code merge.

Options
    • -4
    • +7
    ./.classpath
  2. … 17 more files in changeset.
Friday 17 Apr 2009
10:05 am

erniegx <ernieg@gmail.com>

Updating Greek

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 4 more files in changeset.