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 05 Mar 2018
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
7:49 am

Andrey Balan

LDEV-4520 Stop showing n/a column in iRA's student's choices

Instead show percentages as floats with 2 decimal places.

Options
    • -0
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -7
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
    • -19
    • +2
    /lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp
4:09 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating Greek

Options
    • -4
    • +17
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
Tuesday 27 Feb 2018
11:02 am

Andrey Balan

Merge branch 'LKC-89'

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams.jar
10:59 am

Andrey Balan

LKC-89 add labels

To be able to use them even before they will be added to i18n server

Options
    • -0
    • +26
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +7
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +8
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
10:56 am

Andrey Balan

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

Options
    • -1
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -3
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +46
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentDTO.java
    • -0
    • +48
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -0
    • +24
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionResultDTO.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -10
    • +25
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +454
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -1
    • +25
    /lams_tool_assessment/web/WEB-INF/struts-config.xml
    • -0
    • +15
    /lams_tool_assessment/web/WEB-INF/web.xml
    • -1
    • +2
    /lams_tool_assessment/web/common/taglibs.jsp
  16. … 37 more files in changeset.
10:42 am

Andrey Balan

LKC-89 Move TBL Monitoring interface from lams-private

Add a switch that would display TBL UI monitoring interface. It

should be available only to the TBL template lessons.

Besides, modify the TBL UI monitor as in some cases the iRA (the first

assessment is not only just MCQ, but Assessment). So the change would be

to add as iRA the first assessment activity whether this is MCQ or

assessment.

Options
    • -0
    • +81
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -0
    • +92
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java
    • -0
    • +32
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblUserDTO.java
    • -0
    • +435
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
    • -0
    • +33
    /lams_monitoring/web/WEB-INF/struts-config.xml
    • -0
    • +15
    /lams_monitoring/web/WEB-INF/web.xml
    • -0
    • +400
    /lams_monitoring/web/css/tblmonitor.scss
    • -14
    • +29
    /lams_monitoring/web/monitor.jsp
    • -0
    • +62
    /lams_monitoring/web/tblmonitor/forum.jsp
    • -0
    • +58
    /lams_monitoring/web/tblmonitor/gates.jsp
    • -0
    • +353
    /lams_monitoring/web/tblmonitor/sequence.jsp
    • -0
    • +289
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -0
    • +425
    /lams_monitoring/web/tblmonitor/teams.jsp
    • -0
    • +14
    /lams_monitoring/web/template/taglibs.jsp
10:32 am

Andrey Balan

LKC-89 Avoid JS exception if sequenceInfoDialog is not available

Options
    • -3
    • +4
    /lams_monitoring/web/includes/javascript/monitorLesson.js
10:29 am

Andrey Balan

LKC-89 add auxiliary methods required for TBL monitoring

Options
    • -0
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -8
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -0
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +9
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +61
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
10:26 am

Andrey Balan

LKC-89 introduce chart.js library required for TBL monitoring

Options
    • -0
    • +11
    /lams_central/web/includes/javascript/chartjs.js
Friday 23 Feb 2018
4:45 pm

Marcin Cieslak

Merge branch 'LDEV-4519'

Options
4:43 pm

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • -23
    • +62
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -2
    • +6
    /lams_admin/web/orgPasswordChange.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/IUserDAO.java
    • -7
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Thursday 22 Feb 2018
11:18 pm

Marcin Cieslak

LDEV-4519 Email changed password to users

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -5
    • +20
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
11:01 pm

Marcin Cieslak

LDEV-4519 Real password change

Also correctly bind form widgets with its fields

and process checkboxes correctly.

Options
    • -2
    • +49
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -4
    • +5
    /lams_admin/web/WEB-INF/struts-config.xml
    • -20
    • +25
    /lams_admin/web/orgPasswordChange.jsp
8:37 pm

Marcin Cieslak

LDEV-4519 Add form validation and success message

Options
    • -2
    • +5
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +43
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
    • -56
    • +71
    /lams_admin/web/orgPasswordChange.jsp
    • binary
    /lams_build/lib/lams/lams.jar
6:08 pm

Marcin Cieslak

LDEV-4519 Layout adjustments

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -10
    • +31
    /lams_admin/web/orgPasswordChange.jsp
6:08 pm

Marcin Cieslak

LDEV-4519 Make random passwords easier

Options
    • -3
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/RandomPasswordGenerator.java