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
Saturday 20 Jul 2019
1:25 am

Andrey Balan

LDEV-4836 Limit allowed operations so recalculateMarks can work properly

Options
    • -15
    • +15
    /lams_tool_assessment/web/pages/authoring/basic.jsp
12:46 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
Friday 19 Jul 2019
4:21 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
3:49 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
3:47 pm

Marcin Cieslak

LDEV-4745 Order MCQ users to have consistent iteration results

Options
    • -14
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -40
    • +39
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -14
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
Thursday 18 Jul 2019
10:25 pm

Marcin Cieslak

LDEV-4745 Count MCQ attempts only for given question UID

Options
    • -11
    • +13
    /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
    • -2
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
10:20 pm

Marcin Cieslak

LDEV-4745 Make Assessment questions comparable by order ID

Options
    • -71
    • +88
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
    • -3
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -11
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -16
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
10:17 pm

Andrey Balan

LDEV-4745 Add Stats button to QB search

Options
    • -0
    • +5
    /lams_central/web/qb/qbQuestionDetails.jsp
10:05 pm

Andrey Balan

Merge branch 'LDEV-4839' into LDEV-4745

Options
10:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -6
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -57
    • +241
    /lams_central/web/qb/search.jsp
    • -259
    • +0
    /lams_central/web/qb/searchWidget.jsp
    • -4
    • +6
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -0
    • +2
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +44
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -17
    • +8
    /lams_tool_lamc/web/authoring/itemlist.jsp
    • -0
    • +3
    /lams_tool_scratchie/web/pages/authoring/authoring.jsp
    • -5
    • +3
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
9:13 pm

Andrey Balan

Merge branch 'LDEV-4838' into LDEV-4745

Options
9:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -7
    • +0
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -10
    • +13
    /lams_tool_scratchie/web/pages/authoring/authoring.jsp
    • -25
    • +46
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -39
    • +30
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
6:52 pm

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
6:51 pm

Andrey Balan

LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

Options
    • -9
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -0
    • +44
    /lams_central/web/includes/javascript/qb-search.js
    • -45
    • +7
    /lams_central/web/qb/searchWidget.jsp
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -1
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -7
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -138
    • +190
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -14
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
    • -4
    • +6
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
    • -4
    • +6
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
    • -54
    • +117
    /lams_tool_assessment/web/pages/authoring/randomQuestion.jsp
Tuesday 16 Jul 2019
7:50 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
5:21 pm

Marcin Cieslak

LDEV-4828 Allow question sorting by usage in lessons on collection page

Options
    • -2
    • +2
    /lams_central/web/qb/collection.jsp
    • -6
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
4:53 pm

Marcin Cieslak

LDEV-4782 Sort lessons by organisation. Include only active lessons.

Options
    • -1
    • +1
    /lams_central/web/qb/stats.jsp
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
4:34 pm

Marcin Cieslak

LDEV-4782 Add a link to open lesson monitor on QB stats page

Options
    • -2
    • +11
    /lams_central/web/qb/stats.jsp
4:18 pm

Marcin Cieslak

LDEV-4828 Fix encoding when sending XML with jqGrid collection data

Options
    • -4
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
3:55 pm

Marcin Cieslak

LDEV-4782 Discar grades with NULL mark before calculating indexes

Options
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Monday 15 Jul 2019
11:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
11:34 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4837 Removing white line that appears on iPad partway down dialog

Options
    • -1
    • +0
    /lams_central/web/css/_learner_base.scss
Sunday 14 Jul 2019
8:43 pm

Marcin Cieslak

LDEV-4834 Fetch outcomes using DAO instead of entity relationship

Various question versions share same outcomes. Hibernate does not like

having same collection bound to two entity instances, though, even if

the collection is read-only. In this case we get rid of the collection

and just fetch it using DAO. It probably is a better solution anyway.

Options
    • -2
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -20
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
Saturday 13 Jul 2019
4:18 pm

Marcin Cieslak

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

Options
4:00 pm

Marcin Cieslak

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

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

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

Options
    • -29
    • +40
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -254
    • +253
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -526
    • +566
    /lams_central/web/qb/collection.jsp
    • -461
    • +503
    /lams_central/web/qb/stats.jsp
    • -471
    • +488
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -131
    • +133
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -567
    • +572
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -1
    • +11
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -65
    • +68
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -38
    • +44
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
3:18 pm

Andrey Balan

LDEV-4836 Fix autopatch script

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
7:44 am

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
7:44 am

Andrey Balan

LDEV-4836 Properly assign collections

Options
    • -19
    • +20
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +1
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addessay.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addordering.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -2
    • +3
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -0
    • +2
    /lams_central/web/qb/searchWidget.jsp
    • -5
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
6:10 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
    • -54
    • +35
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -35
    • +89
    /lams_central/web/qb/collection.jsp
    • -4
    • +7
    /lams_central/web/qb/stats.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
5:21 am

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -0
    • +67
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -104
    • +472
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +14
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +6
    /lams_central/web/common/taglibs.jsp
    • -0
    • +7
    /lams_central/web/css/bootstrap-toggle.css
    • -0
    • +28
    /lams_central/web/css/bootstrap-toggle.scss
    • -0
    • +1
    /lams_central/web/css/qb-question.css
    • -0
    • +394
    /lams_central/web/css/qb-question.scss
    • -0
    • +9
    /lams_central/web/includes/javascript/bootstrap-toggle.js
    • -0
    • +135
    /lams_central/web/includes/javascript/qb-option.js
    • -0
    • +80
    /lams_central/web/includes/javascript/qb-question.js
    • -0
    • +29
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -0
    • +28
    /lams_central/web/qb/authoring/addQuestionHeader.jsp
    • -0
    • +231
    /lams_central/web/qb/authoring/addessay.jsp
  16. … 62 more files in changeset.