lams-github / lams_tool_laqa / web / learning

CombinedAnswersContent.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
Last Commit: 05 Apr 24
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
Friday 20 Dec 2019
3:42 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

# lams_learning/conf/language/lams/ApplicationResources.properties

# lams_learning/conf/language/lams/ApplicationResources_en_AU.properties

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -6
    • +7
    ./CombinedAnswersContent.jsp
  2. … 16 more files in changeset.
Monday 09 Dec 2019
2:32 am

Ernie Ghiglione

LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

Options
    • -10
    • +8
    ./CombinedAnswersContent.jsp
  2. … 5 more files in changeset.
Sunday 08 Dec 2019
9:46 pm

Ernie Ghiglione

LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

Options
    • -13
    • +15
    ./CombinedAnswersContent.jsp
  2. … 6 more files in changeset.
Friday 06 Dec 2019
2:32 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -8
    • +0
    ./CombinedAnswersContent.jsp
  2. … 11 more files in changeset.
Thursday 05 Dec 2019
11:41 pm

Andrey Balan

LDEV-4919 Don't focus on question answer

Options
    • -17
    • +8
    ./CombinedAnswersContent.jsp
  2. … 3 more files in changeset.
Friday 06 Sep 2019
2:13 am

Andrey Balan

LDEV-4863 Q&A authoring to look more like Assessment essay authoring

Options
    • -6
    • +6
    ./CombinedAnswersContent.jsp
  2. … 7 more files in changeset.
1:18 am

Andrey Balan

LDEV-4864 Show question body in Q&A learner

Options
    • -13
    • +10
    ./CombinedAnswersContent.jsp
  2. … 6 more files in changeset.
Wednesday 06 Feb 2019
11:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -5
    • +5
    ./CombinedAnswersContent.jsp
  2. … 506 more files in changeset.
Monday 30 Jul 2018
9:05 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A fixes

Options
    • -0
    • +1
    ./CombinedAnswersContent.jsp
  2. … 18 more files in changeset.
Sunday 29 Jul 2018
8:19 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A authoring and learning fixes

Options
    • -3
    • +3
    ./CombinedAnswersContent.jsp
  2. … 10 more files in changeset.
Tuesday 24 Jul 2018
7:27 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Sared resources - authoring - work in progress

Options
    • -6
    • +3
    ./CombinedAnswersContent.jsp
  2. … 33 more files in changeset.
Sunday 24 Jul 2016
12:48 am

Andrey Balan

LDEV-3863 Counter for words in Q&A

Options
    • -11
    • +12
    ./CombinedAnswersContent.jsp
  2. … 4 more files in changeset.
Saturday 12 Mar 2016
7:17 am

erniegx <ernieg@gmail.com>

LDEV-3679: fixing buttons and overall layout

Options
    • -1
    • +1
    ./CombinedAnswersContent.jsp
  2. … 3 more files in changeset.
Tuesday 23 Feb 2016
10:36 pm

erniegx <ernieg@gmail.com>

LDEV-3679: Update Q&A learner to bootstrap

Options
    • -56
    • +76
    ./CombinedAnswersContent.jsp
  2. … 16 more files in changeset.
Tuesday 16 Jun 2015
6:24 am

Andrey Balan

LDEV-3480 Peer review feature for Q&A

Options
    • -11
    • +21
    ./CombinedAnswersContent.jsp
  2. … 54 more files in changeset.
Tuesday 02 Jun 2015
7:30 am

Andrey Balan

LDEV-3480 Peer review feature for Q&A (fixes): a space missing between the number and the paragraph

Options
    • -1
    • +1
    ./CombinedAnswersContent.jsp
  2. … 1 more file in changeset.
Friday 22 May 2015
7:43 am

Andrey Balan

LDEV-3480 Peer review feature for Q&A

Options
    • -11
    • +21
    ./CombinedAnswersContent.jsp
  2. … 52 more files in changeset.
Wednesday 04 Jun 2014
8:55 pm

Andrey Balan

LDEV-3236 Ability to change, add, remove Q&A questions even after student have reached it

Options
    • -22
    • +24
    ./CombinedAnswersContent.jsp
  2. … 4 more files in changeset.
Thursday 09 Jan 2014
1:50 am

Andrey Balan

LDEV-3155 Added leader aware feature

Options
    • -5
    • +16
    ./CombinedAnswersContent.jsp
  2. … 95 more files in changeset.
Friday 12 Jul 2013
10:17 pm

Andrey Balan

LDEV-3076 added ability to upload images by learners using CKeditor

Options
    • -1
    • +1
    ./CombinedAnswersContent.jsp
  2. … 30 more files in changeset.
Monday 25 Feb 2013
10:12 pm

Andrey Balan

LDEV-2908 Added new version of jquery tablesorter plugin

Improvements to Q&A:

* limit number of displayed answers in learner

* ability to sort Q&A responses by rating

Also removed duplicative jsp parts from /learning/LearnerRep.jsp and /learning/RevisitedLearnerRep.jsp

Options
    • -20
    • +0
    ./CombinedAnswersContent.jsp
  2. … 22 more files in changeset.
Saturday 19 Mar 2011
1:14 am

Andrey Balan

LDEV-2653 autosave feature

*merge from lams2_3_release

Options
    • -26
    • +18
    ./CombinedAnswersContent.jsp
  2. … 120 more files in changeset.
Monday 01 Nov 2010
8:27 pm

fmalikoff

Merging changes from 2.3 release branch for LDEV-2524.

Options
    • -1
    • +4
    ./CombinedAnswersContent.jsp
  2. … 29 more files in changeset.
Wednesday 06 Oct 2010
6: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
    • -4
    • +3
    ./CombinedAnswersContent.jsp
  2. … 1096 more files in changeset.
Thursday 02 Jul 2009
4:19 pm

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
    • -2
    • +11
    ./CombinedAnswersContent.jsp
  2. … 167 more files in changeset.
Tuesday 02 Jan 2007
8:42 am

steven

Change textarea to lams:textarea.

Options
    • -2
    • +1
    ./CombinedAnswersContent.jsp
  2. … 2 more files in changeset.
Thursday 23 Nov 2006
3:07 pm

mseaton

updated mcq, qa, vote for RTL

Options
    • -1
    • +1
    ./CombinedAnswersContent.jsp
  2. … 71 more files in changeset.
Friday 27 Oct 2006
4:31 pm

asukkar

Cleaned up jsp.

Options
    • -30
    • +53
    ./CombinedAnswersContent.jsp
  2. … 44 more files in changeset.
Friday 20 Oct 2006
7:38 am

ozgurd

Fix for (LDEV-882) Q&A: Double entry problem with IE6

Options
    • -2
    • +2
    ./CombinedAnswersContent.jsp
  2. … 7 more files in changeset.
Wednesday 18 Oct 2006
4:32 am

ozgurd

Fix for LDEV-829 Replace all instances of bean:message with fmt:message

Options
    • -3
    • +3
    ./CombinedAnswersContent.jsp
  2. … 29 more files in changeset.