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
Monday 18 Feb 2019
6:02 pm

Marcin Cieslak

LDEV-4746 Prepare QB model for stats

Tool content ID was added to each tool QB question so we can track which

activity and lesson it belongs to.

Order ID and create date were moved from subclasses to top QB entities.

Options
    • -25
    • +51
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -1
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
    • -13
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -1
    • +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/McLearningController.java
    • -3
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -12
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -1
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieItemComparator.java
    • -9
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
Saturday 16 Feb 2019
4:19 am

Andrey Balan

Merge branch 'LDEV-4766' into develop

Options
4:18 am

Andrey Balan

LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

Options
    • -25
    • +68
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
4:18 am

Andrey Balan

LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

(cherry picked from commit 7a82139f8dd4ce906c0b733f764055197c694898)

Options
    • -25
    • +68
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
Friday 15 Feb 2019
11:32 pm

Marcin Cieslak

LDEV-4746 Create a super class and table for tools' answers to inherit

Options
    • -32
    • +46
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -0
    • +55
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -16
    • +18
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -35
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -4
    • +4
    /lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
    • -4
    • +4
    /lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -45
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -4
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Togglebutton and checkbox css functional

Options
    • -3
    • +4
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -2
    • +7
    /lams_admin/web/WEB-INF/tags/headItems.tag
    • -15
    • +17
    /lams_central/build.xml
    • -840
    • +0
    /lams_central/conf/scss/_bootstrap-variables.scss
    • -1
    • +1
    /lams_central/conf/scss/material-kit.scss
    • -10
    • +15
    /lams_central/conf/scss/material-kit/_checkboxes.scss
    • -9
    • +14
    /lams_central/conf/scss/material-kit/_togglebutton.scss
    • -3
    • +4
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +7
    /lams_central/web/WEB-INF/tags/headItems.tag
    • -17
    • +17
    /lams_central/web/css/material-kit-blue-primary.css
    • -14043
    • +8462
    /lams_central/web/css/material-kit.css
    • -338
    • +0
    /lams_central/web/css/material-kit.css.map
    • -21
    • +0
    /lams_central/web/css/material-kit.min.css
    • -3
    • +4
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -2
    • +7
    /lams_gradebook/web/WEB-INF/tags/headItems.tag
  16. … 68 more files in changeset.
6:32 am

Andrey Balan

Merge branch 'LDEV-4775' into develop

Options
6:27 am

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

Options
    • -1
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -42
    • +42
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -6
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -11
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -3
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -10
    • +19
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -39
    • +40
    /lams_tool_lamc/web/authoring/candidateAnswersList.jsp
    • -3
    • +1
    /lams_tool_lamc/web/authoring/editQuestionBox.jsp
    • -6
    • +11
    /lams_tool_lamc/web/authoring/itemlist.jsp
6:27 am

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

Options
    • -1
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -42
    • +42
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -6
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -11
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -3
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -10
    • +19
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -39
    • +40
    /lams_tool_lamc/web/authoring/candidateAnswersList.jsp
    • -3
    • +1
    /lams_tool_lamc/web/authoring/editQuestionBox.jsp
    • -6
    • +11
    /lams_tool_lamc/web/authoring/itemlist.jsp
Thursday 14 Feb 2019
4:09 pm

Marcin Cieslak

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

Options
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_ko_KR.properties
  16. … 11 more files in changeset.
3:41 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Chat Updated

Options
    • -2
    • +2
    /lams_tool_chat/web/pages/authoring/addCondition.jsp
    • -6
    • +6
    /lams_tool_chat/web/pages/learning/learning.jsp
    • -4
    • +1
    /lams_tool_chat/web/pages/learning/notebook.jsp
    • -3
    • +2
    /lams_tool_chat/web/pages/monitoring/daterestriction.jsp
    • -6
    • +1
    /lams_tool_chat/web/pages/monitoring/summary.jsp
12:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

Options
11:54 am

Marcin Cieslak

Merge branch 'LDEV-4771' into develop

Options
11:53 am

Marcin Cieslak

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

Options
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_ko_KR.properties
  16. … 11 more files in changeset.
11:21 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

Options
    • -0
    • +5
    /lams_central/web/css/_inlineeditor.scss
    • -26
    • +23
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -29
    • +9
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    /lams_tool_assessment/web/pages/learning/results/ordering.jsp
10:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -5
    • +5
    /lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag
    • -9
    • +9
    /lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -8
    • +6
    /lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -4
    • +4
    /lams_admin/web/WEB-INF/tags/TextSearch.tag
    • -0
    • +14
    /lams_admin/web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    /lams_admin/web/config/editconfig.jsp
    • -1
    • +1
    /lams_admin/web/disabledusers.jsp
    • -2
    • +2
    /lams_admin/web/groupStatistics.jsp
    • -1
    • +1
    /lams_admin/web/ldap.jsp
    • -1
    • +1
    /lams_admin/web/organisation/createOrEdit.jsp
    • -1
    • +1
    /lams_admin/web/policies/editPolicy.jsp
    • -1
    • +1
    /lams_admin/web/policies/policyTable.jsp
    • -1
    • +1
    /lams_admin/web/signupmanagement/add.jsp
    • -1
    • +1
    /lams_admin/web/signupmanagement/list.jsp
  16. … 377 more files in changeset.
Wednesday 13 Feb 2019
6:41 pm

Marcin Cieslak

Merge branch 'LDEV-4774'

Options
6:41 pm

Marcin Cieslak

LDEV-4774 Fix role check for subcourse gradebook

Options
    • -4
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
    • -1
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
6:39 pm

Marcin Cieslak

LDEV-4731 Use email as user login

Options
    • -8
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 12 Feb 2019
10:35 pm

Andrey Balan

LDEV-4770 CKEditor's content use display:block instead of inline-block

Content in CKEditor is by default displayed using display: inline-block,

however, this CSS property doesn't get applied in real life. Which

creates a discrepancy between the way content displayed inside the

editor and later on outside of it.

Options
    • -0
    • +5
    /lams_central/web/css/_inlineeditor.scss
9:08 pm

Marcin Cieslak

Merge branch 'LDEV-4772' into develop

Options
9:06 pm

Marcin Cieslak

LDEV-4772 Fix properties dialog position in authoring after first drag

Options
    • -0
    • +7
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
6:15 pm

Marcin Cieslak

LDEV-4746 Migrate Scratchie to QB

Options
    • -5
    • +110
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -2
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -1
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -4
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
    • -10
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -3
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java
    • -4
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -115
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -7
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -99
    • +39
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -2
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  16. … 17 more files in changeset.
10:17 am

Ernie Ghiglione

LDEV-4587 LDEV-4607 Adding missing labels

Options
    • -4
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
7:02 am

Andrey Balan

Merge branch 'LDEV-4762' into develop

Options
6:58 am

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

Options
    • -0
    • +3
    /lams_central/web/includes/javascript/Sortable.js
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -56
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +10
    /lams_tool_assessment/web/includes/css/assessment.scss
    • -26
    • +23
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -29
    • +9
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    /lams_tool_assessment/web/pages/learning/results/ordering.jsp
6:58 am

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

Options
    • -0
    • +3
    /lams_central/web/includes/javascript/Sortable.js
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -56
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +10
    /lams_tool_assessment/web/includes/css/assessment.scss
    • -26
    • +23
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -29
    • +9
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    /lams_tool_assessment/web/pages/learning/results/ordering.jsp
Sunday 10 Feb 2019
8:22 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +6
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
8:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +6
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
8:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +6
    /lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties