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
Thursday 04 Aug 2016
3:27 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Removed protoype.hs so that it doesn't interfere with jquery in the progress bar.

Options
    • -5
    • +4
    /lams_tool_survey/web/pages/learning/learning.jsp
2:56 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3933: Switch to monitoring Page type, so that the progress bar isn't shown.

Options
    • -1
    • +1
    /lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
    • -1
    • +1
    /lams_tool_sbmt/web/monitoring/mark/mark.jsp
    • -1
    • +1
    /lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
12:34 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3932: Removed use of prototype.js so that it won't interfere with jquery in the progress bar.

Options
    • -4
    • +2
    /lams_tool_spreadsheet/web/pages/learning/learning.jsp
12:03 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Show the progress bar when we auto run an item (ie it appears in the main learner window).

Options
    • -9
    • +28
    /lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
10:35 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3917: Do not show the new sliding progress bar in monitor.

Options
    • -1
    • +1
    /lams_tool_laqa/web/monitoring/Reflections.jsp
10:31 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3930: Hide the new sliding progress bar when the comments are viewed in Monitoring.

Options
    • -1
    • +1
    /lams_tool_nb/web/monitoring/comments.jsp
9:38 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3929: Updating to suit sliding progress bar. The success screen is really a popup screen so it should not show the progress bar.

Options
    • -1
    • +2
    /lams_tool_pixlr/web/pages/learning/success.jsp
9:11 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Reverting previous changes to show the "More" button, otherwise we get a page not found error when there are no coments.

Options
    • -1
    • +1
    /lams_central/web/comments/allview.jsp
Wednesday 03 Aug 2016
8:26 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3928: Multiuser mode was creating duplicate nodes due to the global id being returned as null, rather than 0.

Options
    • -1
    • +2
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
Tuesday 02 Aug 2016
5:27 pm

Marcin Cieslak

LDEV-3910: Make login page use absoulte, not relative form action URL.

Options
    • -1
    • +1
    /lams_central/web/login.jsp
12:43 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3926: Updating to suit sliding progress bar. Mindmap uses a non-standard flag to indicate monitoring mode in learning for multi user mindmaps, so use the hideProgressBar override to hide it in monitoring.

Options
    • -2
    • +2
    /lams_tool_mindmap/web/pages/learning/mindmap.jsp
11:21 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3924: Updating MCQ learner screens to suit sliding div based progress bar.

Options
    • -3
    • +6
    /lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
    • -0
    • +1
    /lams_tool_lamc/web/learning/Notebook.jsp
    • -0
    • +1
    /lams_tool_lamc/web/learning/SimpleLearnerError.jsp
    • -0
    • +1
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
    • -0
    • +1
    /lams_tool_lamc/web/learning/WaitForLeader.jsp
    • -0
    • +1
    /lams_tool_lamc/web/learning/defineLater.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/submissionDeadline.jsp
11:11 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3925: Returning straight to View Answers was losing the userID value, which caused the reflection screen to fail.

Options
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
Monday 01 Aug 2016
11:23 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3923: Updating gmap learner screens to suit sliding div based progress bar.

Options
    • -0
    • +1
    /lams_tool_gmap/web/layouts/learningLayout.jsp
    • -0
    • +1
    /lams_tool_gmap/web/pages/learning/notebook.jsp
10:18 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3918: Updating chat screens to suit sliding div based progress bar.

Options
    • -1
    • +1
    /lams_tool_chat/web/pages/monitoring/chatHistory.jsp
10:18 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3918: Updating wait for chat screens to suit sliding div based progress bar.

Options
    • -0
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
9:16 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3918: Updating wait for leader screens to suit sliding div based progress bar and adding monitoring labels that have been lost from I18N

Options
    • -0
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_assessment/web/pages/learning/waitforleader.jsp
9:15 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Stopping the exception thrown when the logic to get the tool session id tries a form that does not contain toolSessionId.

Options
    • -2
    • +3
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_kaltura/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -1
    • +3
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
  16. … 15 more files in changeset.
Sunday 31 Jul 2016
2:45 pm

Andrey Balan

LDEV-3905 added <permission type="java.net.SocketPermission" name="*" actions="connect,resolve"/>

Options
    • -0
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
2:45 pm

Andrey Balan

LDEV-3905 added <permission type="java.net.SocketPermission" name="*" actions="connect,resolve"/>

Options
    • -0
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
Friday 29 Jul 2016
8:52 pm

Andrey Balan

LDEV-3919 LoginRequest should add user to lesson's staff when method=monitor is requested

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -14
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
12:23 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Adding support activities

Options
    • -1
    • +0
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -16
    • +15
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_kaltura/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -16
    • +18
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
  16. … 15 more files in changeset.
12:04 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Adding support activities

Options
    • -16
    • +19
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -16
    • +19
    /lams_central/web/WEB-INF/tags/Page.tag
    • -7
    • +10
    /lams_central/web/includes/javascript/progressBar.js
10:26 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3915: Updating core learner screens like gates and groups to suit sliding div based progress bar.

Options
    • -0
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -0
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +14
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +5
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_learning/web/grouping/show.jsp
    • -1
    • +2
    /lams_learning/web/layout/branchingWaitLayout.jsp
    • -1
    • +1
    /lams_learning/web/layout/groupWaitLayout.jsp
8:01 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Stopping Notebook call triggering a refresh of the learner screen.

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
7:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Stopping Notebook call triggering a refresh of the learner screen.

Options
    • -2
    • +2
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_kaltura/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_larsrc/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_leader/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_mindmap/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_nb/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_notebook/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_pixlr/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_preview/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_sbmt/web/WEB-INF/tags/Page.tag
  16. … 7 more files in changeset.
12:11 am

Andrey Balan

LDEV-3637 Add integration API: clone a lesson based on a lessonID

Options
    • binary
    /lams_build/lib/lams/lams-monitoring.jar
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -0
    • +38
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -0
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +16
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -48
    • +62
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Thursday 28 Jul 2016
11:57 pm

Andrey Balan

LDEV-3895 Changes to mark hedging format in excel export

Options
    • -82
    • +99
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -13
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
6:19 pm

Marcin Cieslak

LDEV-3917: Prevent navigation on Notebook button click.

Options
    • -1
    • +1
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
12:16 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3917: The new sliding progress bar needs jquery to work.

Options
    • -0
    • +2
    /lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
    • -0
    • +1
    /lams_tool_laqa/web/learning/Notebook.jsp
    • -0
    • +1
    /lams_tool_laqa/web/learning/WaitForLeader.jsp
    • -0
    • +1
    /lams_tool_laqa/web/learning/defineLater.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/submissionDeadline.jsp