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 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
6:42 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -10
    • +13
    /lams_build/3rdParty.userlibraries
6:28 am

Andrey Balan

LDEV-4810 Add batik lib to 3rdParty.userlibraries

Options
    • -9
    • +10
    /lams_build/3rdParty.userlibraries
6:25 am

Andrey Balan

Merge branch 'LDEV-4805'

Options
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -151
    • +0
    /lams_central/web/css/jquery.jqGrid.css
    • -531
    • +0
    /lams_central/web/includes/javascript/jquery.jqGrid.js
    • -168
    • +0
    /lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js
    • -3
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +8
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
    • -17
    • +9
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -19
    • +8
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
    • -12
    • +16
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -2
    • +0
    /lams_tool_lamc/web/common/monitoringheader.jsp
    • -45
    • +28
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
    • -12
    • +2
    /lams_tool_larsrc/web/css/monitor.scss
    • -1
    • +0
    /lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
    • -8
    • +7
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
    • -4
    • +2
    /lams_tool_notebook/web/pages/monitoring/monitoring.jsp
  16. … 13 more files in changeset.
Tuesday 23 Apr 2019
8:08 pm

Marcin Cieslak

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

Options
8:06 pm

Marcin Cieslak

Merge branch 'LDEV-4813'

Options
8:05 pm

Marcin Cieslak

LDEV-4813 Use tables only if a condition is provided

If tables are used and no condition which uses them is provided, a full

outer join is run. It takes ages to complete on a large instance.

Options
    • -6
    • +9
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
7:47 pm

Marcin Cieslak

LDEV-4813 Add a missing foreign key in Assessment tool

Options
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
7:25 pm

Marcin Cieslak

Merge branch 'LDEV-4782' into LDEV-4745

Options
    • -8
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -30
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -6
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
5:47 pm

Marcin Cieslak

SP-2 Allow only first and last name editing on back end

Options
    • -14
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -0
    • +1
    /lams_central/web/profile/editprofile.jsp
Saturday 20 Apr 2019
2:01 am

Andrey Balan

Merge branch 'master' into develop

Options
1:51 am

Andrey Balan

LDEV-4808 Fix .css file name

Options
    • -1
    • +1
    /lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
    • -1
    • +1
    /lams_tool_survey/web/pages/monitoring/monitoring.jsp