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
Wednesday 24 Jul 2019
4:51 am

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -20
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -5
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:45 am

Andrey Balan

LDEV-4836 No need for removeNewLineCharacters() method anymore

Options
    • -23
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
4:44 am

Andrey Balan

LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -6
    • +29
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -0
    • +6
    /lams_central/web/css/bootstrap-select.css
    • -0
    • +9
    /lams_central/web/includes/javascript/bootstrap-select.js
    • -14
    • +19
    /lams_central/web/includes/javascript/qb-search.js
    • -1
    • +1
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -16
    • +74
    /lams_central/web/qb/search.jsp
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -20
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -5
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -100
    • +99
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -4
    • +4
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -3
    • +3
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
    • -52
    • +94
    /lams_tool_assessment/web/pages/authoring/randomQuestion.jsp
Tuesday 23 Jul 2019
9:19 pm

Marcin Cieslak

LDEV-4746 Skip validation CKEditor for question description

jQuery validation plugin does not seem to work well with CKEditor.

Options
    • -1
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
9:08 pm

Marcin Cieslak

LDEV-4746 Extra question name clean up

Options
    • -5
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
8:48 pm

Marcin Cieslak

LDEV-4834 Allow LO widget on add new QB question screen

Options
    • -3
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -3
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql
8:31 pm

Marcin Cieslak

LDEV-4746 Use table as question ID generator for QbQuestion

In the future we can add new columns to lams_sequence_generator, so we

have a single table for generating new IDs instead table-per-ID.

Options
    • -1
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -0
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
  16. … 3 more files in changeset.
7:13 pm

Marcin Cieslak

LDEV-4834 Revert to panel LO widget in QB question authoring

Options
    • -1
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
Monday 22 Jul 2019
11:19 pm

Marcin Cieslak

LDEV-4836 Set an option as correct if it has 100% mark

Options
    • -56
    • +51
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
11:12 pm

Marcin Cieslak

LDEV-4746 Trim questions' names and descriptions

Options
    • -5
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -10
    • +33
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -1
    • +14
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +14
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
  16. … 56 more files in changeset.
10:44 pm

Marcin Cieslak

LDEV-4834 Move Learning Outcomes widget to Settings tab

Options
    • -4
    • +4
    /lams_central/web/qb/authoring/addessay.jsp
    • -4
    • +4
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -4
    • +4
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -4
    • +4
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -5
    • +5
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -4
    • +4
    /lams_central/web/qb/authoring/addordering.jsp
    • -4
    • +4
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -4
    • +4
    /lams_central/web/qb/authoring/addtruefalse.jsp
6:38 pm

Marcin Cieslak

LDEV-4746 Add improved migration script

It runs faster and makes matching more efficient.

Options
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190109.sql
    • -624
    • +676
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
6:37 pm

Marcin Cieslak

LDEV-4745 Ignore CSS files generated from SCSS

Options
    • -0
    • +2
    /lams_central/.gitignore
6:36 pm

Marcin Cieslak

LDEV-4745 Remove CSS files generated from SCSS

Options
    • -7
    • +0
    /lams_central/web/css/bootstrap-toggle.css
    • -1
    • +0
    /lams_central/web/css/qb-question.css
6:33 pm

Marcin Cieslak

LDEV-4834 Add Learning Outcomes widget to edit QB question screen

Options
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +2
    /lams_central/web/qb/authoring/addQuestionHeader.jsp
    • -1
    • +5
    /lams_central/web/qb/authoring/addessay.jsp
    • -1
    • +5
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -0
    • +4
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +4
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +4
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -0
    • +4
    /lams_central/web/qb/authoring/addordering.jsp
    • -0
    • +4
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -0
    • +4
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -6
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
6:04 pm

Marcin Cieslak

LDEV-4745 Make service methods do what they claim to do

Getting max question ID and version returned already incremented version

instead of actual max. Now they return real max value and need to be

manually incremented afterwards.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
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