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
Friday 01 Feb 2019
10:02 pm

Marcin Cieslak

LDEV-4767 Add login and logout event logs

Options
    • -4
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190201.sql
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -6
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
10:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -2
    • +5
    /lams_admin/web/WEB-INF/tags/Tab.tag
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/TabBody.tag
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/TabBodyArea.tag
    • -36
    • +27
    /lams_admin/web/WEB-INF/tags/Tabs.tag
    • -0
    • +1
    /lams_admin/web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    /lams_admin/web/css/admin.scss
    • -1
    • +1
    /lams_admin/web/logevent.jsp
    • -1
    • +1
    /lams_admin/web/orgPasswordChange.jsp
    • -1
    • +1
    /lams_admin/web/policies/policies.jsp
    • -1
    • +1
    /lams_admin/web/policies/userConsents.jsp
    • -1
    • +1
    /lams_admin/web/userChangePass.jsp
    • -1
    • +1
    /lams_admin/web/usersearchlist.jsp
    • -4
    • +17
    /lams_central/conf/scss/_lams_variables.scss
    • -1
    • +6
    /lams_central/conf/scss/material-kit/_responsive.scss
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java
  16. … 301 more files in changeset.
Thursday 31 Jan 2019
8:09 am

Andrey Balan

LDEV-4765 Add sorting of the question answers

Also some other improvements.

Options
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
    • -0
    • +3
    /lams_central/web/includes/javascript/Sortable.js
    • -73
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -55
    • +1
    /lams_tool_assessment/web/includes/javascript/assessmentoption.js
    • -62
    • +96
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -52
    • +36
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
Wednesday 30 Jan 2019
8:44 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

Options
    • -8
    • +12
    /lams_central/conf/scss/_lams_variables.scss
    • -2
    • +0
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +6
    /lams_central/web/css/_dialogs.scss
    • -2
    • +2
    /lams_central/web/css/bootstrap-tour.min.css
    • -0
    • +188
    /lams_central/web/css/theme.bootstrap_4.css
    • -5
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -2
    • +2
    /lams_central/web/includes/javascript/bootstrap-tour.min.js
    • -7
    • +1
    /lams_central/web/includes/javascript/bootstrap.min.js
    • -5
    • +1
    /lams_central/web/includes/javascript/dialog.js
    • -1
    • +0
    /lams_central/web/includes/javascript/main.js
    • -1
    • +1
    /lams_central/web/login.jsp
    • -1
    • +1
    /lams_central/web/main.jsp
    • -1
    • +1
    /lams_learning/web/css/kumalive.scss
    • -2
    • +2
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -18
    • +18
    /lams_monitoring/web/css/_tblmonitor_base.scss
  16. … 3 more files in changeset.
Tuesday 29 Jan 2019
8:15 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

Options
7:58 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Scheduled lesson with rescheduled gate can start now

Options
    • -17
    • +43
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
7:08 pm

Marcin Cieslak

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

Options
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:06 pm

Marcin Cieslak

Merge branch 'LDEV-4763'

Options
7:06 pm

Marcin Cieslak

LDEV-4763 Process LD annotations when importing a LD

Options
    • -10
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
6:48 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge LDEV-4759, LDEV-4760, LDEV-4764 into develop

Options
6:43 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4764 Labels use standard font-weight overriding Bootstrap change

Options
    • -4
    • +4
    /lams_central/web/css/_learner_base.scss
4:16 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4760 Fixed spacing in authoring criteria entry panel

Options
    • -2
    • +4
    /lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -0
    • +8
    /lams_central/web/css/_learner_base.scss
    • -2
    • +4
    /lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_learning/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +4
    /lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  16. … 18 more files in changeset.
11:14 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Scheduled gate in scheduled lesson can be viewed/rescheduled.

Options
    • -17
    • +43
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -21
    • +2
    /lams_monitoring/web/gate/scheduleGateContent.jsp
Sunday 27 Jan 2019
6:10 pm

Marcin Cieslak

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

Options
6:09 pm

Marcin Cieslak

LDEV-4696 Reintroduce a failsafe for missing branch activities set

There are normal situations where the collection is null. It needs to be

checked before attempting to add something.

Options
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
10:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

Options
    • -1
    • +4
    /lams_admin/web/WEB-INF/tags/Head.tag
    • -38
    • +30
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_build/common.properties
    • -45
    • +48
    /lams_central/conf/scss/_lams_variables.scss
    • -118
    • +2
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -114
    • +119
    /lams_central/conf/scss/_mixins.scss
    • -0
    • +66
    /lams_central/conf/scss/material-kit.scss
    • -0
    • +53
    /lams_central/conf/scss/material-kit/_alerts.scss
    • -0
    • +43
    /lams_central/conf/scss/material-kit/_badges.scss
    • -0
    • +228
    /lams_central/conf/scss/material-kit/_buttons.scss
    • -0
    • +327
    /lams_central/conf/scss/material-kit/_cards.scss
    • -0
    • +95
    /lams_central/conf/scss/material-kit/_carousel.scss
    • -0
    • +201
    /lams_central/conf/scss/material-kit/_checkboxes.scss
    • -0
    • +66
    /lams_central/conf/scss/material-kit/_core-bootstrap.scss
    • -0
    • +10
    /lams_central/conf/scss/material-kit/_custom-forms.scss
  16. … 249 more files in changeset.
Saturday 26 Jan 2019
2:35 pm

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +6
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +5
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +1
    /lams_central/web/css/_progressBar_base.scss
    • -1
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -18
    • +39
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190126.sql
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -14
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
  16. … 9 more files in changeset.
2:07 am

Andrey Balan

LDEV-4765 introducing new question authoring UI

Options
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/LICENSE
    • -0
    • +5
    /lams_central/web/ckeditor/plugins/confighelper/README.md
    • -0
    • +128
    /lams_central/web/ckeditor/plugins/confighelper/docs/install.html
    • -0
    • +59
    /lams_central/web/ckeditor/plugins/confighelper/docs/styles.css
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
    • -1
    • +8
    /lams_central/web/includes/javascript/ckconfig_custom.js
    • -0
    • +11
    /lams_central/web/includes/javascript/jquery-ui.touch-punch.js
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -26
    • +38
    /lams_tool_assessment/web/includes/javascript/assessmentoption.js
    • -68
    • +349
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -4
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
2:07 am

Andrey Balan

QB_UI introducing new question authoring UI

Options
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/LICENSE
    • -0
    • +5
    /lams_central/web/ckeditor/plugins/confighelper/README.md
    • -0
    • +128
    /lams_central/web/ckeditor/plugins/confighelper/docs/install.html
    • -0
    • +59
    /lams_central/web/ckeditor/plugins/confighelper/docs/styles.css
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
    • -1
    • +8
    /lams_central/web/includes/javascript/ckconfig_custom.js
    • -0
    • +11
    /lams_central/web/includes/javascript/jquery-ui.touch-punch.js
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -26
    • +38
    /lams_tool_assessment/web/includes/javascript/assessmentoption.js
    • -68
    • +350
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -4
    • +30
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
Friday 25 Jan 2019
2:47 pm

Marcin Cieslak

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

Options
2:46 pm

Marcin Cieslak

LDEV-4721 Fix version filter method names

Options
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
Thursday 24 Jan 2019
10:16 pm

Marcin Cieslak

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

Options
10:15 pm

Marcin Cieslak

Merge branch 'LDEV-4757'

Options
10:13 pm

Marcin Cieslak

LDEV-4757 Fix group overwriting with same UIID

Groups' UIIDs were not taken into account when calculating max UIID for

opened LD. Sometimes an existing UIID got generated and it overwrote an

existing group.

Also adjust new group naming.

Options
    • -0
    • +4
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
6:44 pm

Marcin Cieslak

LDEV-4746 Introduce QB service and DAO

Options
    • -1
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -9
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -16
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -2
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
6:21 pm

Marcin Cieslak

LDEV-4746 Move QB entities to another package

Options
    • -110
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbOption.java
    • -187
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbQuestion.java
    • -50
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbToolQuestion.java
    • -0
    • +110
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java
    • -0
    • +187
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +50
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
  16. … 5 more files in changeset.
5:32 pm

Marcin Cieslak

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

Options
5:30 pm

Marcin Cieslak

Merge branch 'LDEV-4758'

Options
5:29 pm

Marcin Cieslak

LDEV-4758 In CKEditor plugin use JS code which is IE11 compliant

Options
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/image2/dialogs/image2.js
5:05 pm

Marcin Cieslak

LDEV-4746 Improve SQL migration script

When looking for unique questions to be put into Question Bank, it takes

into account its options too.

Options
    • -22
    • +60
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql