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
Tuesday 14 Nov 2017
6:51 pm

Marcin Cieslak

LDEV-4459 Export archived email notification

Options
    • -0
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +52
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +50
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -1
    • +15
    /lams_monitoring/web/emailnotifications/archivedEmailList.jsp
5:38 pm

Marcin Cieslak

LDEV-4459 Display a paged list of email notification recipients

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/events/dao/EventDAO.java
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -1
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +12
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +61
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -7
    • +32
    /lams_monitoring/web/emailnotifications/archivedEmailList.jsp
7:35 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -2
    • +4
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
7:34 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4449: adding label

Options
    • -4
    • +5
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
Monday 13 Nov 2017
11:59 pm

Marcin Cieslak

LDEV-4459 Display archived email notifications

Options
    • -0
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +12
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -10
    • +18
    /lams_monitoring/web/emailnotifications/archivedEmailList.jsp
11:41 pm

Marcin Cieslak

LDEV-4459 Archive immediate or scheduled email notifications

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +63
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/EmailNotificationArchive.hbm.xml
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171113.sql
    • -0
    • +92
    /lams_common/src/java/org/lamsfoundation/lams/events/EmailNotificationArchive.java
    • -4
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -0
    • +8
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -3
    • +7
    /lams_monitoring/web/emailnotifications/courseNotifications.jsp
    • -5
    • +7
    /lams_monitoring/web/emailnotifications/lessonNotifications.jsp
6:25 pm

Marcin Cieslak

LDEV-4459 Archived notifications front end

Options
    • -1
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -23
    • +56
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -0
    • +5
    /lams_monitoring/web/WEB-INF/struts-config.xml
    • -12
    • +0
    /lams_monitoring/web/emailnotifications/additionalSettings.jsp
    • -0
    • +90
    /lams_monitoring/web/emailnotifications/archivedEmailList.jsp
    • -1
    • +15
    /lams_monitoring/web/emailnotifications/courseNotifications.jsp
    • -1
    • +15
    /lams_monitoring/web/emailnotifications/lessonNotifications.jsp
Saturday 11 Nov 2017
11:40 pm

Marcin Cieslak

LDEV-4468 Change the way TH uses Noticeboard form

Options
    • -2
    • +16
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -9
    • +2
    /lams_tool_nb/web/learnerContent.jsp
8:44 am

Andrey Balan

Merge branch 'LDEV-4467'

Options
8:39 am

Andrey Balan

LDEV-4467 Ability to edit burning questions

As the main prerequisite for this task we needed to upgrade jqGrid to

the latest jqGrid free, as conditional cellediting became available only

there

Options
    • -3
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +24
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +4
    /lams_tool_scratchie/web/WEB-INF/struts-config.xml
    • -26
    • +50
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -7
    • +8
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
Friday 10 Nov 2017
10:39 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4460: Adding labels

Options
    • -4
    • +5
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
9:56 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4460 Print page with all responses and comments

Monitor now has a printable page with all the responses and

comments for one question for one session/group.

Options
    • -1
    • +1
    /lams_tool_laqa/web/monitoring/SummaryContent.jsp
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4460 Print page with all responses and comments

Monitor now has a printable page with all the responses and

comments for one question for one session/group.

Options
    • -0
    • +2
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -3
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
    • -0
    • +90
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
    • -1
    • +5
    /lams_tool_laqa/web/WEB-INF/struts-config.xml
    • -0
    • +80
    /lams_tool_laqa/web/monitoring/PrintAnswers.jsp
    • -0
    • +2
    /lams_tool_laqa/web/monitoring/SummaryContent.jsp
5:34 am

Andrey Balan

LDEV-4467 skip showing empty burning questions' jqGrids

Options
    • -1
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -8
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
2:59 am

Andrey Balan

LDEV-4466 No need to show notebook to a teacher

When teacher opens user's learning, there is no need to show a notebook

left by the user

Options
    • -26
    • +0
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
2:29 am

Andrey Balan

Merge branch 'LDEV-4464'

Options
2:25 am

Andrey Balan

LDEV-4464 Fix Gradebook export: problem displaying Chinese characters

StringEscapeUtils.escapeHtml() method has a bug (in version of

commons-lang prior to 3.0): it escapes multibyte characters like

Chinese, Japanese, etc. Thus it was replaced it with Spring's

HtmlUtils.htmlEscape().

Options
    • -3
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
12:57 am

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -43
    • +47
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -23
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -16
    • +21
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
    • -2
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
12:27 am

Andrey Balan

LDEV-4466 Prevent exception on opening learning by a teacher

Exception was thrown on opening learning by a teacher when there

is no leader available yet

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -8
    • +11
    /lams_tool_scratchie/web/pages/learning/waitforleader.jsp
12:27 am

Andrey Balan

LDEV-4466 Prevent exception on opening learning by a teacher

Exception was thrown on opening learning by a teacher when there

is no leader available yet

Options
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Thursday 09 Nov 2017
4:41 pm

Marcin Cieslak

LDEV-4453 Fix an error when a learner has no marks at all in a lesson

Options
    • -3
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
11:41 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Adding labels

Options
    • -2
    • +43
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +43
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
11:40 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: adding labels

Options
    • -2
    • +7
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
11:30 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4453: adding labels

Adding labels to central and learning

Options
    • -8
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -49
    • +10
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +10
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 08 Nov 2017
11:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +1
    /lams_central/.gitignore
    • -0
    • +1
    /lams_central/web/css/jqGrid.confidenceLevelFormattter.css
    • -0
    • +41
    /lams_central/web/css/jquery.jqGrid.confidence-level-formattter.scss
    • -34
    • +0
    /lams_central/web/includes/javascript/jqGrid.confidenceLevelFormattter.js
    • -0
    • +34
    /lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js
    • -0
    • +5
    /lams_tool_assessment/web/includes/css/monitoring.scss
    • -4
    • +5
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -3
    • +4
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -3
    • +4
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
    • -3
    • +4
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
10:31 pm

Andrey Balan

Merge branch 'LDEV-4455'

Options
    • -17
    • +15
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
10:30 pm

Andrey Balan

LDEV-4455 Remove edit burning questions functionality

Besides, increase autosave interval to 60 seconds.

Options
    • -17
    • +15
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
    • -106
    • +0
    /lams_tool_scratchie/web/pages/learning/burningQuestions.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -4
    • +8
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -9
    • +0
    /lams_tool_scratchie/web/pages/learning/results.jsp
3:52 pm

Marcin Cieslak

LDEV-4453 Clean up unused methods

Options
    • -43
    • +7
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
3:50 pm

Marcin Cieslak

LDEV-4453 Prevent errors when marks are null

Options
    • -4
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
12:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Fixed error, improved performance of mark recalculation

Options
    • -4
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java