lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Monday 28 Oct 2019
5:36 pm

Marcin Cieslak

LDEV-4895 Fix detection whether MCQ has already been attempted

Options
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
Sunday 27 Oct 2019
4:26 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +6
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
Saturday 26 Oct 2019
8:59 am

Ernie Ghiglione

LDEV-4769 Updating translations

Options
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +13
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
8:53 am

Ernie Ghiglione

LDEV-4769 Update translations

Options
    • -2
    • +13
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +17
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +11
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +13
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
4:37 am

Andrey Balan

Merge branch 'master' into develop

Options
4:36 am

Andrey Balan

LDEV-4858 Set marks and other numeric values as numbers

Options
    • -56
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
3:20 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
3:19 am

Andrey Balan

Merge branch 'LDEV-4859'

Options
3:19 am

Andrey Balan

LDEV-4859 Include time with dates

Options
    • -11
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelCell.java
    • -13
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -64
    • +70
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Friday 25 Oct 2019
8:52 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
8:52 pm

Andrey Balan

Merge branch 'LDEV-4879'

Options
8:50 pm

Andrey Balan

LDEV-4879 Create lesson in subgroups at one go

Options
    • -0
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -41
    • +81
    /lams_central/web/addLesson.jsp
    • -1
    • +8
    /lams_central/web/includes/javascript/addLesson.js
    • -84
    • +88
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
Thursday 24 Oct 2019
9:02 pm

Marcin Cieslak

LDEV-4884 Several minor fixes for UUID and description QTI import

Options
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -4
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:21 pm

Marcin Cieslak

LDEV-3000 Add a fix for QTI import pop up closing in Chrome

Options
    • -0
    • +4
    /lams_central/web/questions/questionChoice.jsp
7:49 pm

Marcin Cieslak

LDEV-4745 Add QB questions to private collection for TBL template

Options
    • -2
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +17
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
7:22 pm

Marcin Cieslak

LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

Options
    • -7
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -35
    • +43
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -104
    • +129
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -0
    • +1
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -0
    • +2
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/rest/RestTags.java
    • -55
    • +65
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +29
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -27
    • +39
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
4:28 am

Andrey Balan

LDEV-4892 Log all request parameters coming to LoginRequestLtiServlet

Options
    • -0
    • +19
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
3:55 am

Andrey Balan

LDEV-4891 Calculate iRA percentages for VSA questions in TBL monitoring

Options
    • -4
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
2:39 am

Andrey Balan

LDEV-4890 IRA student choices percentages should be <= than 100%

Options
    • -4
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -8
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
2:27 am

Andrey Balan

LDEV-4889 Display correct/incorrect icons in TBL monitor's Teams tab

Options
    • -1
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -10
    • +127
    /lams_tool_assessment/web/pages/tblmonitoring/teams.jsp
    • -92
    • +0
    /lams_tool_assessment/web/pages/tblmonitoring/userresponse.jsp
2:26 am

Andrey Balan

LDEV-4888 Prevent exception thrown on answering ordering type of question

Options
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 23 Oct 2019
7:20 pm

Marcin Cieslak

LDEV-4884 Make QB UUID processing easier

Also allow setting QB UUID on import and not generate it always when a

question gets saved into DB.

Options
    • -9
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -0
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20191023.sql
    • -5
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
6:43 pm

Marcin Cieslak

LDEV-4745 Fix TBL template Scratchie question adding in authoring

Even if there were RAT multiple questions added, only one showed up in

Scratchie.

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 22 Oct 2019
8:11 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -2
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -3
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +2
    /lams_central/web/qb/search.jsp
    • -2
    • +11
    /lams_central/web/qb/stats.jsp
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -76
    • +336
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -147
    • +377
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Monday 21 Oct 2019
10:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -7
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/util/JsonUtil.java
    • -50
    • +57
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -36
    • +45
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:15 pm

Andrey Balan

Merge branch 'master' into develop

Options
8:12 pm

Andrey Balan

LDEV-4885 Remove all white space characters from preset marks setting

Options
    • -1
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 18 Oct 2019
8:59 pm

Andrey Balan

LDEV-4875 Respect QbQuestion's case sensitive setting

* Simplify learning.jsp, so it gets most of the data from the server

rather than tries to figure it out on a client side

* Optimize the way answers get fetched from Assessment

* Fix the following issue: if there is no activity selected to fetch

assessment answers from, then Scratchie don't show user answers

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -19
    • +20
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -8
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -10
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -70
    • +71
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -34
    • +63
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -64
    • +47
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Thursday 17 Oct 2019
1:13 pm

Marcin Cieslak

Merge branch 'LDEV-4884' into LDEV-4745

Options
1:12 pm

Marcin Cieslak

LDEV-4884 UUIDs in QTI export/import in QB

Options
    • -0
    • +48
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -0
    • +5
    /lams_central/web/questions/questionChoice.jsp
    • -2
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
    • -8
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
    • -13
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java