lams-github / lams_tool_lamc

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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 22 Sep 2020
1:48 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp

Options
    • -2
    • +2
    ./authoring/candidateAnswersList.jsp
  2. … 3 more files in changeset.
1:40 pm

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -3
    • +4
    ./WEB-INF/tags/Arrow.tag
    • -2
    • +2
    ./authoring/candidateAnswersList.jsp
  3. … 51 more files in changeset.
Monday 17 Aug 2020
10:34 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -1
    • +1
    ./authoring/BasicContent.jsp
  2. … 6 more files in changeset.
Friday 17 Jul 2020
5:45 pm

Marcin Cieslak

LDEV-5054 Fix Learning Outcome removal Ajax call

Options
    • -0
    • +1
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 31 more files in changeset.
Friday 05 Jun 2020
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./authoring/editQuestionBox.jsp
    • -1
    • +1
    ./authoring/itemlist.jsp
  3. … 18 more files in changeset.
Monday 01 Jun 2020
3:19 pm

Marcin Cieslak

LDEV-5025 Allow leaving comments even after user rated

Options
    • -1
    • +1
    ./WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.
Friday 29 May 2020
6:39 pm

Marcin Cieslak

LDEV-4925 Fix new lines on learner results page in Peer Review

Options
    • -1
    • +1
    ./WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
Wednesday 27 May 2020
3:12 pm

Marcin Cieslak

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

Options
    • -1
    • +2
    ./WEB-INF/tags/Rating.tag
  2. … 34 more files in changeset.
12:51 am

Marcin Cieslak

LDEV-5052 Refresh page and scroll to comments on rating

Options
    • -4
    • +13
    ./WEB-INF/tags/Rating.tag
  2. … 33 more files in changeset.
Thursday 21 May 2020
2:44 pm

Marcin Cieslak

LDEV-5030 Sanitise user names for initial Etherpad content

Options
    • -1
    • +4
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Monday 18 May 2020
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Friday 15 May 2020
6:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    ./WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -80
    • +80
    ./tblmonitoring/mcq.jsp
    • -145
    • +145
    ./tblmonitoring/mcqStudentChoices.jsp
  3. … 419 more files in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -98
    • +0
    ./WEB-INF/tags/Etherpad.tag
  2. … 30 more files in changeset.
Thursday 30 Apr 2020
2:43 pm

Marcin Cieslak

LDEV-5014 Add spinner while QB panel loads in authoring

Options
    • -0
    • +1
    ./authoring/BasicContent.jsp
  2. … 3 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -228
    • +228
    ./monitoring/parts/statsPart.jsp
    • -150
    • +150
    ./tblmonitoring/mcqStudentChoices.jsp
  4. … 461 more files in changeset.
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
Sunday 23 Feb 2020
4:09 pm

Ernie Ghiglione

LDEV-4980 MCQ confidence level labels are switched

Options
    • -1
    • +1
    ./learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./learning/SingleQuestionAnswersContent.jsp
    • -1
    • +1
    ./learning/ViewAnswers.jsp
    • -1
    • +1
    ./monitoring/SummaryContent.jsp
10:37 am

Ernie Ghiglione

LDEV-4980 MCQ confidence level labels are switched

Options
    • -1
    • +1
    ./learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./learning/SingleQuestionAnswersContent.jsp
    • -1
    • +1
    ./learning/ViewAnswers.jsp
    • -1
    • +1
    ./monitoring/SummaryContent.jsp
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -25
    • +0
    ./403.jsp
    • -27
    • +0
    ./404.jsp
    • -17
    • +0
    ./WEB-INF/spring-servlet.xml
    • -53
    • +0
    ./WEB-INF/tags/AdvancedAccordian.tag
    • -46
    • +0
    ./WEB-INF/tags/Alert.tag
    • -55
    • +0
    ./WEB-INF/tags/Arrow.tag
    • -133
    • +0
    ./WEB-INF/tags/AuthoringButton.tag
    • -422
    • +0
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -348
    • +0
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
    • -113
    • +0
    ./WEB-INF/tags/CKEditor.tag
    • -79
    • +0
    ./WEB-INF/tags/Comments.tag
    • -76
    • +0
    ./WEB-INF/tags/CommentsAuthor.tag
    • -64
    • +0
    ./WEB-INF/tags/Date.tag
    • -66
    • +0
    ./WEB-INF/tags/DefineLater.tag
    • -48
    • +0
    ./WEB-INF/tags/Errors.tag
  16. … 178 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./403.jsp
    • -1
    • +0
    ./404.jsp
    • -0
    • +6
    ./WEB-INF/web.xml
    • -1
    • +0
    ./common/taglibs.jsp
    • -1
    • +1
    ./error.jsp
    • -2
    • +0
    ./login.jsp
  7. … 167 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

Options
    • -1
    • +0
    ./authoring/AuthoringTabsHolder.jsp
    • -1
    • +0
    ./authoring/BasicContent.jsp
  3. … 3 more files in changeset.
Friday 10 Jan 2020
9:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

(cherry picked from commit 1dc5f5ec294283f43ce1deaa33066bdf1190ff1d)

Options
    • -1
    • +1
    ./authoring/AuthoringTabsHolder.jsp
  2. … 2 more files in changeset.
9:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

Options
    • -1
    • +1
    ./authoring/AuthoringTabsHolder.jsp
  2. … 2 more files in changeset.
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./authoring/BasicContent.jsp
  2. … 32 more files in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
    • -2
    • +2
    ./authoring/AuthoringTabsHolder.jsp
    • -1
    • +7
    ./tblmonitoring/mcqStudentChoices.jsp
  4. … 92 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -1
    • +1
    ./monitoring/MonitoringMaincontent.jsp
  2. … 9 more files in changeset.