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 08 Feb 2019
5:50 am

Andrey Balan

LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

Options
    • -1
    • +10
    /lams_tool_assessment/web/includes/css/addQuestion.scss
    • -65
    • +65
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -52
    • +127
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -43
    • +43
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -61
    • +61
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -1
    • +0
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
    • -6
    • +12
    /lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp
Thursday 07 Feb 2019
4:09 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page functional

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/SimplePanel.tag
    • -36
    • +34
    /lams_central/conf/scss/_lams_variables.scss
    • -36
    • +34
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/SimplePanel.tag
    • -212
    • +228
    /lams_central/web/css/_main_base.scss
    • -11
    • +12
    /lams_central/web/main.jsp
    • -2
    • +2
    /lams_gradebook/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_learning/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_tool_chat/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_tool_daco/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_tool_doku/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_tool_forum/web/WEB-INF/tags/SimplePanel.tag
    • -2
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/SimplePanel.tag
  16. … 21 more files in changeset.
12:46 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4767 LDEV-4755 adding labels

Adding labels for use login/out logs and anti virus config

Options
    • -6
    • +9
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +8
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
9:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Choice of colour schemes blue or purple

Options
    • -0
    • +65
    /lams_central/build.xml
    • -5
    • +17
    /lams_central/conf/scss/_lams_variables.scss
    • -2
    • +115
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -0
    • +67
    /lams_central/conf/scss/material-kit-blue-primary.scss
    • -0
    • +39
    /lams_central/conf/scss/material-kit/_variables-blue.scss
    • -0
    • +11
    /lams_central/conf/scss/material-kit/variables/_brand-blue.scss
    • -1
    • +1
    /lams_central/web/css/defaultHTML_learner.scss
    • -0
    • +12490
    /lams_central/web/css/material-kit-blue-primary.css
    • -1
    • +1
    /lams_central/web/css/purple_learner.scss
4:52 am

Andrey Balan

LDEV-4765 Apply new UI to other question types

Options
    • -0
    • +6
    /lams_central/web/includes/javascript/jquery-ui.slider.js
    • -7
    • +11
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +18
    /lams_tool_assessment/web/common/authoringQuestionHeader.jsp
    • -7
    • +241
    /lams_tool_assessment/web/includes/css/addQuestion.scss
    • -59
    • +0
    /lams_tool_assessment/web/includes/javascript/assessmentoption.js
    • -0
    • +136
    /lams_tool_assessment/web/includes/javascript/authoring-options.js
    • -0
    • +48
    /lams_tool_assessment/web/includes/javascript/authoring-question.js
    • -96
    • +96
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -141
    • +105
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -116
    • +91
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -497
    • +154
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -144
    • +109
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -126
    • +93
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -116
    • +93
    /lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
  16. … 9 more files in changeset.
Wednesday 06 Feb 2019
11:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/DefineLater.tag
    • -36
    • +18
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -4
    • +4
    /lams_admin/web/WEB-INF/tags/SimplePanel.tag
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/headItems.tag
    • -3
    • +3
    /lams_admin/web/config/editconfig.jsp
    • -11
    • +11
    /lams_admin/web/ldap.jsp
    • -1
    • +1
    /lams_admin/web/orgPasswordChange.jsp
    • -16
    • +16
    /lams_admin/web/organisation/cloneStart.jsp
    • -9
    • +9
    /lams_admin/web/organisation/list.jsp
    • -8
    • +8
    /lams_admin/web/remove.jsp
    • -8
    • +8
    /lams_admin/web/statistics.jsp
    • -3
    • +3
    /lams_admin/web/sysadmin.jsp
    • -4
    • +4
    /lams_admin/web/themeManagement.jsp
    • -1
    • +1
    /lams_admin/web/toolcontent/toolcontentlist.jsp
  16. … 492 more files in changeset.
Tuesday 05 Feb 2019
7:06 pm

Marcin Cieslak

LDEV-4746 Inform author of detected question changes

In MC authoring if a new question or version gets added, the author gets

a pop up displayed.

Further steps are detection of minor changes (update and not create a

new version) and allowing author to choose whether changes are minor or

should lead to new version.

Options
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -0
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -1
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -40
    • +92
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +21
    /lams_tool_lamc/web/authoring/itemlist.jsp
Monday 04 Feb 2019
4:41 pm

Marcin Cieslak

Merge branch 'LDEV-4767' into develop

Options
4:40 pm

Marcin Cieslak

LDEV-4767 Move logout logging to higher level methods

This way we know what triggered logout: manual logout, sysadmin or

duplicate session in another browser.

Timeout logout will be silent.

Options
    • -1
    • +15
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
    • -3
    • +16
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -22
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
4:21 pm

Marcin Cieslak

LDEV-4767 Add IP to login event

Options
    • -12
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
Friday 01 Feb 2019
11:06 pm

Marcin Cieslak

LDEV-4731 Adjust parser code for current code state on master

Options
    • -3
    • +12
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
11:01 pm

Marcin Cieslak

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

Options
    • -1
    • +12
    /lams_central/web/WEB-INF/web.xml
10:55 pm

Marcin Cieslak

LDEV-4731, LDEV-4761 Create users and orgs via integrated server

Provisioned users will authenticate through Azure using SAML. They need

to go through an integrated server, so they need to be already

provisioned as external users.

Options
    • -52
    • +72
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
10:02 pm

Marcin Cieslak

Merge branch 'LDEV-4767' into develop

Options
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.