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 11 May 2019
5:59 am

Andrey Balan

LDEV-4777 Search QB interface is now available in Assessment tool

Options
    • -1
    • +1
    /lams_central/web/qb/qbQuestionDetails.jsp
    • -37
    • +43
    /lams_central/web/qb/search.jsp
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -76
    • +54
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/importQuestions.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
5:56 am

Andrey Balan

Merge branch 'LDEV-4746' into LDEV-4777

Options
Friday 10 May 2019
10:33 pm

Marcin Cieslak

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

Options
10:30 pm

Marcin Cieslak

Merge branch 'LDEV-4817'

Options
10:29 pm

Marcin Cieslak

LDEV-4817 Do not create blank burning questions, delete existing ones

Options
    • -0
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -6
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
10:29 pm

Marcin Cieslak

LDEV-4817 Do not create blank burning questions, delete existing ones

Options
    • -0
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -5
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
9:45 pm

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -11
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -13
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -11
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
7:34 pm

Andrey Balan

Merge branch 'master' into develop

Options
7:33 pm

Andrey Balan

LDEV-4816 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -1
    • +11
    /lams_monitoring/web/tblmonitor/teams.jsp
6:10 pm

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -6
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -27
    • +46
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -30
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -38
    • +45
    /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/util/AssessmentEscapeUtils.java
    • -61
    • +66
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
6:08 pm

Andrey Balan

LDEV-4746 Fix adding of several items at once and import QTI questions

Options
    • -8
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
Thursday 09 May 2019
7:57 pm

Marcin Cieslak

LDEV-4746 Fixes and tuning for QB migration SQL script

Options
    • -22
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Wednesday 08 May 2019
5:11 am

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/SearchQBController.java
    • -11
    • +245
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -0
    • +63
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java
    • -11
    • +218
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +111
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -35
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java
    • -41
    • +73
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -70
    • +73
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -5
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
    • -12
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -6
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java
  16. … 66 more files in changeset.
5:08 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4746

Options
Tuesday 30 Apr 2019
5:32 am

Andrey Balan

Merge branch 'LDEV-4765' into LDEV-4745

Options
5:31 am

Andrey Balan

LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

Options
    • -4
    • +4
    /lams_central/web/includes/javascript/jquery.validate.js
    • -17
    • +17
    /lams_tool_assessment/web/common/authoringQuestionHeader.jsp
    • -13
    • +22
    /lams_tool_assessment/web/includes/css/addQuestion.scss
    • -2
    • +34
    /lams_tool_assessment/web/includes/javascript/authoring-question.js
    • -6
    • +10
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -13
    • +14
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -8
    • +14
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -8
    • +16
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -9
    • +19
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -7
    • +13
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -8
    • +16
    /lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
    • -12
    • +19
    /lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
Monday 29 Apr 2019
4:22 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    /lams_central/web/includes/javascript/main.js
4:21 pm

Marcin Cieslak

LDEV-4813 Speed up event log processing with an extra index

Options
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190429.sql
    • -37
    • +45
    /lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
Friday 26 Apr 2019
3:13 am

Andrey Balan

Merge branch 'LDEV-4811'

Options
3:13 am

Andrey Balan

LDEV-4811 Solve the problem of working with several open monitor dialogs

Options
    • -1
    • +14
    /lams_central/web/includes/javascript/dialog.js
    • -0
    • +1
    /lams_central/web/includes/javascript/main.js
    • -48
    • +49
    /lams_monitoring/web/monitor.jsp
Thursday 25 Apr 2019
6:51 pm

Marcin Cieslak

LDEV-4746 Set default mark when QB'ing MCQ questions

A default mark of 1 was set during question creation in authoring. Since

now we import instead of create, it is better to also do it during

migration.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
5:06 am

Andrey Balan

Merge branch 'master' into develop

Options
5:05 am

Andrey Balan

Merge branch 'LDEV-4814'

Options
5:04 am

Andrey Balan

LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

Options
    • -0
    • +12
    /lams_central/web/css/_learner_base.scss
    • -5
    • +0
    /lams_tool_assessment/web/includes/css/monitoring.scss
    • -1
    • +0
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -1
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
    • -1
    • +0
    /lams_tool_preview/web/includes/css/learning.scss
    • -12
    • +0
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -3
    • +0
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
5:01 am

Andrey Balan

LDEV-4814 Update free-jqGrid to the latest 4.15.5 version

Options
    • -3
    • +3
    /lams_central/web/css/free.ui.jqgrid.min.css
    • -4
    • +4
    /lams_central/web/includes/javascript/free.jquery.jqgrid.min.js
3:17 am

Andrey Balan

LDEV-4815 Fix URL that got broken after migrating to spring mvc

Options
    • -6
    • +8
    /lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
2:54 am

Andrey Balan

LDEV-4810 Create SVG with a transparent background

Options
    • -2
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java
Wednesday 24 Apr 2019
8:14 pm

Marcin Cieslak

LDEV-4746 Fix a duplicate association in MCQ

Options
    • -4
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
7:59 pm

Marcin Cieslak

LDEV-4782 Show burning questions with no likes in QB stats

Options
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
7:58 pm

Marcin Cieslak

LDEV-4746 Set tool content ID to Scratchie items on activity copy

Options
    • -0
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java