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 21 Mar 2018
9:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4535 Changes to TBL Template

Added support for a Peer Review activity, Monitor selected group

count saved properly the application exercises are grouped.

Options
    • -0
    • +8
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/conf/language/lams/TBLResources.properties
    • -0
    • +101
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
    • -25
    • +83
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -20
    • +91
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +1
    /lams_central/web/WEB-INF/struts-config.xml
    • -0
    • +20
    /lams_central/web/authoring/template/comms.jsp
    • -1
    • +19
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -0
    • +29
    /lams_central/web/authoring/template/tool/peerreviewstar.jsp
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
    • -30
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -2
    • +26
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • binary
    /lams_www/web/public/ld-templates/tbl/tbl.png
    • -1
    • +3
    /lams_www/web/public/ld-templates/tbl/tblintro.html
    • -1
    • +3
    /lams_www/web/public/ld-templates/tbl/tblintro_en_AU.html
Monday 19 Mar 2018
10:47 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Burning Questions accessible on iPad

Redid change obscured by merge.

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Friday 16 Mar 2018
4:14 pm

Marcin Cieslak

Merge branch 'LDEV-4530' with scratchies shown in learner results page

Conflicts with LDEV-4532

lams_tool_scratchie/web/pages/learning/questionlist.jsp

Options
    • -97
    • +1
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
4:07 pm

Marcin Cieslak

LDEV-4530 Control in authoring whether scratchies are shown in results

Options
    • -6
    • +8
    /lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql
    • -20
    • +30
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +7
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
    • -3
    • +1
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -2
    • +4
    /lams_tool_scratchie/web/pages/learning/results.jsp
3:33 pm

Marcin Cieslak

LDEV-4530 Display scratchie results in learner interface

Till now only monitor could view it.

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -67
    • +82
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -97
    • +3
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -1
    • +3
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -0
    • +97
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
12:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4531 Essay Question displays 8 rows for text entry

Options
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/essay.jsp
12:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Burning Questions accessible on iPad

Also did the same fix to similar entries in authoring to ensure

they would work on an iPad

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -2
    • +3
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
    • -1
    • +1
    /lams_tool_lamc/web/authoring/editQuestionBox.jsp
    • -1
    • +1
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
Tuesday 13 Mar 2018
9:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4529 Notification lesson list restricted on Monitor access

Options
    • -14
    • +28
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -2
    • +2
    /lams_monitoring/web/emailnotifications/courseNotifications.jsp
6:48 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4528 Empty Courses can only have not started notifications

Options
    • -0
    • +10
    /lams_monitoring/web/emailnotifications/courseNotifications.jsp
4:11 pm

Marcin Cieslak

LDEV-4402 Update MySQL connector source files

Options
    • -2
    • +6
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/AuthenticationPlugin.java
    • -1
    • +4
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/CharsetMapping.java
    • -97
    • +78
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/ConnectionImpl.java
    • -0
    • +4
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/ConnectionProperties.java
    • -3
    • +40
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/ConnectionPropertiesImpl.java
    • -8
    • +30
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/ExportControlled.java
    • -32
    • +46
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/LoadBalancedAutoCommitInterceptor.java
    • -1
    • +24
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/LoadBalancedConnectionProxy.java
    • -3
    • +4
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/LocalizedErrorMessages.properties
    • -5
    • +16
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/MultiHostConnectionProxy.java
    • -0
    • +8
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/MultiHostMySQLConnection.java
    • -14
    • +25
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/MysqlIO.java
    • -4
    • +4
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/PerConnectionLRUFactory.java
    • -1
    • +15
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/ReplicationConnectionProxy.java
    • -1
    • +4
    /3rdParty_sources/mysql-connector/com/mysql/jdbc/ResultSetImpl.java
  16. … 13 more files in changeset.
4:11 pm

Marcin Cieslak

LDEV-4402 Upgrade MySQL connector so it works with server 8.0.3+

Options
    • -0
    • +33
    /lams_build/3rdParty.userlibraries
    • -1
    • +1
    /lams_build/deploy-tool/deploy.bat
    • -1
    • +1
    /lams_build/deploy-tool/deploy.sh
    • binary
    /lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar
    • binary
    /lams_build/deploy-tool/lib/mysql-connector-java-5.1.46-bin.jar
    • binary
    /lams_build/lib/mysql/mysql-connector-java-5.1.43-bin.jar
    • binary
    /lams_build/lib/mysql/mysql-connector-java-5.1.46-bin.jar
    • -1
    • +1
    /lams_build/liblist.txt
    • -16
    • +16
    /lams_tool_deploy/.classpath
11:34 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4527: Added Portraits to Learner Search screen

Options
    • -3
    • +3
    /lams_central/web/findUserLessons.jsp
Monday 12 Mar 2018
3:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4526: Email calculations support learners with no ratings.

Options
    • -4
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
Thursday 08 Mar 2018
11:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4525 Fixed Reflection issues

Options
    • -0
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -77
    • +22
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
    • -0
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -0
    • +5
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -9
    • +21
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
Wednesday 07 Mar 2018
2:58 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4524 Monitoring Task Item List loads correctly

This screen also missed being bootstrapped so the layout is

updated. Also fixed a bug that stopped the Task Item list loading

for a learner entered task if the Monitor had gone into Edit

Activity and saved the activity.

Options
    • -1
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java
    • -3
    • +42
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
    • -32
    • +37
    /lams_tool_task/web/pages/monitoring/itemsummary.jsp
Monday 05 Mar 2018
8:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
8:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -5
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -3
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -3
    • +3
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -2
    • +2
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -1
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
  16. … 20 more files in changeset.
6:42 pm

Marcin Cieslak

Merge branch 'LDEV-4523'

Options
6:40 pm

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -164
    • +191
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -31
    • +42
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -101
    • +87
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -25
    • +28
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
6:39 pm

Marcin Cieslak

LDEV-4523 Add method to remove actitivy mark

Options
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • -9
    • +34
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +6
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
Sunday 04 Mar 2018
9:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -0
    • +39
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +21
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +5
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -10
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -9
    • +10
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -47
    • +33
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -10
    • +14
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -13
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -6
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -11
    • +15
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Debugging removed for merge to master.

Options
    • -19
    • +0
    /lams_admin/web/logevent.jsp
Saturday 03 Mar 2018
6:14 am

Andrey Balan

Merge branch 'LDEV-4520'

Options
    • -20
    • +2
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
6:13 am

Andrey Balan

LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

Options
    • -1
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
    • -8
    • +4
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -0
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -153
    • +61
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -0
    • +5
    /lams_tool_assessment/web/WEB-INF/struts-config.xml
    • -2
    • +11
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
    • -20
    • +2
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -0
    • +139
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
    • -1
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
Friday 02 Mar 2018
11:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4521 Updating user does not trigger index error

Options
    • -1
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
    • -2
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -2
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
6:06 am

Andrey Balan

LDEV-4520 Fix export excel feature for AEs tab

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
Wednesday 28 Feb 2018
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learner names in monitoring are Lastname, Firstname

Options
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -1
    • +1
    /lams_central/web/emailuser.jsp
    • -1
    • +1
    /lams_central/web/includes/javascript/addLesson.js
    • -1
    • +1
    /lams_central/web/includes/javascript/dialog.js
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +1
    /lams_learning/web/notebook/viewalljournals.jsp
    • -3
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -2
    • +2
    /lams_monitoring/web/includes/javascript/monitorLesson.js
7:52 am

Andrey Balan

LDEV-4520 Fix several CSS issues

Options
    • -5
    • +4
    /lams_monitoring/web/css/tblmonitor.scss
    • -2
    • +2
    /lams_monitoring/web/tblmonitor/teams.jsp
7:52 am

Andrey Balan

LDEV-4520 Change the way TBL activity is detected

TBL activity should contain the following sequence Grouping->(MCQ or

Assessment)->Leader Selection->Scratchie but it might have some other

gates or activities in the middle though.

Options
    • -44
    • +68
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java