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 25 Feb 2019
6:01 pm

Marcin Cieslak

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

Options
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
6:00 pm

Marcin Cieslak

LDEV-4721 Add class renaming filter for branching conditions

Tools' entities sometimes are used in branching conditions, which are a

part of LearningDesignDTO. Core XML needs to be parsed too and tools'

packages renamed.

Options
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
3:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tablesorter, Learner Progress Bar tweaked

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Alert.tag
    • -2
    • +1
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/TSTable.tag
    • -7
    • +7
    /lams_central/conf/scss/_lams_variables.scss
    • -7
    • +7
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Alert.tag
    • -2
    • +1
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/TSTable.tag
    • -1
    • +2
    /lams_central/web/authoringConfirm.jsp
    • -34
    • +103
    /lams_central/web/css/_learner_base.scss
    • -1
    • +188
    /lams_central/web/css/jquery.tablesorter.theme.bootstrap.css
    • -188
    • +0
    /lams_central/web/css/theme.bootstrap_4.css
    • -1
    • +1
    /lams_central/web/includes/javascript/progressBar.js
    • -1
    • +1
    /lams_central/web/profile/portrait.jsp
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/Alert.tag
  16. … 108 more files in changeset.
Sunday 24 Feb 2019
10:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Improved styling for accordians

Options
    • -3
    • +0
    /lams_central/conf/scss/_lams_variables.scss
    • -3
    • +0
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -116
    • +6
    /lams_central/conf/scss/_mixins.scss
    • -10
    • +42
    /lams_central/web/css/_learner_base.scss
    • -1
    • +0
    /lams_central/web/css/purple_learner.scss
    • -18
    • +16
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
Friday 22 Feb 2019
11:30 pm

Marcin Cieslak

LDEV-4782 Add initial implementation of QB statistics

Options
    • -0
    • +54
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -0
    • +225
    /lams_central/web/qb/stats.jsp
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +38
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbStatsDTO.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +44
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
11:17 pm

Marcin Cieslak

LDEV-4746 Set tool content ID also on MCQ clone for lesson

Options
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
7:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -6
    • +19
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_admin/web/orgPasswordChange.jsp
    • -1
    • +1
    /lams_admin/web/policies/userConsents.jsp
    • -6
    • +19
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +48
    /lams_central/web/css/_learner_base.scss
    • -3
    • +3
    /lams_central/web/css/free.ui.jqgrid.min.css
    • -4
    • +4
    /lams_central/web/includes/javascript/free.jquery.jqgrid.min.js
    • -3
    • +5
    /lams_central/web/main.jsp
    • -6
    • +19
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -14
    • +16
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -16
    • +26
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -64
    • +58
    /lams_gradebook/web/gradebookMonitor.jsp
    • -16
    • +14
    /lams_gradebook/web/includes/css/gradebook.scss
    • -1
    • +0
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
    • -6
    • +19
    /lams_learning/web/WEB-INF/tags/Page.tag
  16. … 36 more files in changeset.
Thursday 21 Feb 2019
11:32 pm

Marcin Cieslak

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

Options
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
11:31 pm

Marcin Cieslak

LDEV-4780 Properly detect if authoring is in a frame

Options
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
11:30 pm

Marcin Cieslak

Merge branch 'LDEV-4776'

Options
11:29 pm

Marcin Cieslak

LDEV-4776 Let monitors see course gradebook for their lessons

Group manager sees all lessons in a course. Monitor sees only ones he is

a monitor in.

Options
    • -7
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -26
    • +32
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -8
    • +11
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -10
    • +12
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
6:31 pm

Marcin Cieslak

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

Options
    • -9
    • +10
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
6:27 pm

Marcin Cieslak

Merge branch 'LDEV-4780'

Options
6:25 pm

Marcin Cieslak

LDEV-4780 Use callbak to resize iframe instead of load detection

When iframe with LD for importing activities gets loaded, the SVG is not

ready yet and reports false height. Instead of detecting when it is

ready, authoring JS code in the iframe reports height when it loads

completely to its parent frame.

Options
    • -9
    • +10
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
Wednesday 20 Feb 2019
9:54 pm

Marcin Cieslak

LDEV-4731 Re-enable users who were disable before if they are in CSV

Options
    • -0
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
9:43 pm

Marcin Cieslak

LDEV-4731 Disable learners who are not in any course anymore

Options
    • -0
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
11:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page restyled.

Options
    • -11
    • +13
    /lams_central/conf/scss/_lams_variables.scss
    • -10
    • +12
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -1
    • +6
    /lams_central/web/css/_learner_base.scss
    • -332
    • +181
    /lams_central/web/css/_main_base.scss
    • -12
    • +10
    /lams_central/web/favoriteOrganisations.jsp
    • -9
    • +9
    /lams_central/web/group.jsp
    • -3
    • +5
    /lams_central/web/groupContents.jsp
    • -6
    • +6
    /lams_central/web/groupHeader.jsp
    • -21
    • +17
    /lams_central/web/main.jsp
    • -4
    • +4
    /lams_central/web/notificationsprivate.jsp
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