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
Wednesday 15 Mar 2017
1:57 am

Andrey Balan

LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

Options
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -34
    • +57
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -38
    • +45
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +1
    /lams_tool_assessment/web/WEB-INF/struts-config.xml
    • -1
    • +13
    /lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
Tuesday 14 Mar 2017
9:56 pm

Marcin Cieslak

LDEV-4272: Check if learner progress belongs to the logged in user.

Options
    • -0
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
12:18 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4239: I18N the buttons on the main tour.

Options
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/web/mainTour.jsp
12:06 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4239: Monitor tour with wiki help button moved onto tour dialog.

Options
    • -3
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_monitoring/web/css/monitorLesson.css
    • -13
    • +8
    /lams_monitoring/web/monitor.jsp
    • -10
    • +30
    /lams_monitoring/web/monitorTour.jsp
Monday 13 Mar 2017
8:48 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4239: Initial implementation of Monitor tour.

Options
    • -1
    • +35
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -5
    • +6
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -5
    • +24
    /lams_monitoring/web/monitor.jsp
    • -0
    • +205
    /lams_monitoring/web/monitorTour.jsp
Saturday 11 Mar 2017
4:06 am

Andrey Balan

LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

Options
    • -59
    • +68
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -6
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -27
    • +38
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +3
    /lams_tool_assessment/web/pages/authoring/advance.jsp
Friday 10 Mar 2017
6:53 pm

Andrey Balan

LDEV-3962 Added border-radius property

Options
    • -0
    • +1
    /lams_central/web/css/main.css
    • -0
    • +1
    /lams_central/web/less/main.less
6:47 pm

Andrey Balan

LDEV-4265 Remove wrong dataType parameter

Options
    • -1
    • +0
    /lams_monitoring/web/includes/javascript/monitorLesson.js
6:35 pm

Andrey Balan

LDEV-4264 Fix archive lessons feature

Options
    • -2
    • +13
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -52
    • +7
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -2
    • +12
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -26
    • +28
    /lams_monitoring/web/monitor.jsp
4:29 pm

Marcin Cieslak

LDEV-4124: Set the default font size to system's default size so existing LDs do not change on load.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
4:28 pm

Marcin Cieslak

LDEV-4124: Add label size and color.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +17
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +9
    /lams_central/web/css/authoring.css
    • -7
    • +19
    /lams_central/web/includes/javascript/authoring/authoringDecoration.js
    • -5
    • +13
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +34
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.hbm.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170310.sql
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
3:54 am

Andrey Balan

LDEV-4053 Refactor code - quite a few methods are duplicated across LearningAction AuthorAction and MonitorAction.java. It will best probably to put these into a single util class - Similarly for the UI, there's plenty of repeated parts that perhaps can we put into a common folder and reused from there.

Options
    • -0
    • +113
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java
    • -148
    • +50
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
    • -155
    • +68
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
    • -338
    • +32
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
    • -40
    • +2
    /lams_tool_images/web/WEB-INF/struts-config.xml
    • -2
    • +1
    /lams_tool_images/web/pages/authoring/authoring.jsp
    • -4
    • +3
    /lams_tool_images/web/pages/authoring/basic.jsp
    • -2
    • +0
    /lams_tool_images/web/pages/authoring/parts/addimage.jsp
    • -2
    • +1
    /lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
    • -1
    • +1
    /lams_tool_images/web/pages/authoring/parts/imagefile.jsp
    • -2
    • +0
    /lams_tool_images/web/pages/learning/learning.jsp
    • -10
    • +15
    /lams_tool_images/web/pages/learning/parts/addimage.jsp
    • -10
    • +19
    /lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp
    • -11
    • +0
    /lams_tool_images/web/pages/learning/start.jsp
    • -169
    • +0
    /lams_tool_images/web/pages/monitoring/parts/addimage.jsp
  16. … 3 more files in changeset.
Thursday 09 Mar 2017
7:47 pm

Andrey Balan

LDEV-3962 Added border-radius property

Options
    • -2
    • +7
    /lams_central/web/less/defaultHTML_learner.less
    • -19
    • +25
    /lams_central/web/less/main.less
11:21 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4255, LDEV-4256 Removing Configuration UI options no longer used

Options
    • -3
    • +0
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_central/web/includes/javascript/openUrls.js
    • -0
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170309.sql
    • -11
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
8:11 am

erniegx <ernieg@gmail.com>

LDEV-4258 adding labels

Options
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    /lams_tool_survey/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
8:03 am

erniegx <ernieg@gmail.com>

LDEV-4054: updating Greek

Options
    • -95
    • +10
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
5:31 am

Andrey Balan

LDEV-3962 Added border-radius property

Options
    • -4
    • +9
    /lams_central/web/css/defaultHTML_learner.css
    • -17
    • +23
    /lams_central/web/css/main.css
    • -0
    • +2
    /lams_central/web/css/thickbox.css
    • -99
    • +97
    /lams_central/web/main.jsp
5:27 am

Andrey Balan

LDEV-4263 Remove width limitation from the images produced by CKEditor's JLaTeXMath plugin

Options
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
Wednesday 08 Mar 2017
9:02 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -1
    • +1
    /lams_tool_survey/conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
    • -0
    • +4
    /lams_tool_survey/web/pages/monitoring/monitoring.jsp
    • -5
    • +8
    /lams_tool_survey/web/pages/monitoring/summary.jsp
8:49 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -1
    • +4
    /lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
    • -4
    • +11
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
8:14 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -1
    • +1
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
8:05 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -1
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -0
    • +4
    /lams_tool_lamc/web/common/monitoringheader.jsp
    • -13
    • +9
    /lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
    • -3
    • +4
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
7:02 pm

Marcin Cieslak

LDEV-4180: Allow NULL value for a column which has mistakenly marked as NOT NULL.

Options
    • -1
    • +1
    /lams_tool_lamc/db/sql/create_lams_tool_mc.sql
6:15 pm

Andrey Balan

LDEV-4263 Remove width limitation from the images produced by CKEditor's JLaTeXMath plugin

Options
    • -6
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java
2:26 pm

Marcin Cieslak

LDEV-4261: Remove version properties from entities. Remove management of optimistic locking failures as they never happen.

Options
    • -5
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
    • -6
    • +0
    /lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
    • -0
    • +14
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170308.sql
    • -16
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
    • -6
    • +0
    /lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
    • -0
    • +14
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql
    • -15
    • +2
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
    • -31
    • +2
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
12:06 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download and whole of session student email generation from multiple triggers by disabling the button. The existing file download code was made generic and moved to lams_common.

Options
    • -1
    • +2
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -36
    • +20
    /lams_tool_preview/web/pages/monitoring/summary.jsp
11:58 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +4
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -7
    • +13
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
11:55 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Creating a generic method for downloading a file and letting the user know when the download has finished. Suitable to use in tool monitoring screens.

Options
    • -0
    • +43
    /lams_central/web/includes/javascript/download.js
7:00 am

erniegx <ernieg@gmail.com>

LDEV-4180: fixing typos

Options
    • -4
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql
6:55 am

erniegx <ernieg@gmail.com>

LDEV-4180: fixing typos

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170101.sql
    • -4
    • +3
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20170101.sql