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
Friday 06 Jul 2018
1:28 am

Andrey Balan

Merge branch 'LDEV-4618'

Options
1:28 am

Andrey Balan

LDEV-4618 Fixing "removeLearnerFile is not defined" JS error

Options
    • -0
    • +15
    /lams_tool_sbmt/web/includes/javascript/marks.js
    • -1
    • +7
    /lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
    • -20
    • +7
    /lams_tool_sbmt/web/monitoring/mark/mark.jsp
12:59 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Almost finished learning and monitoring - needed corrections

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java
    • -1
    • +1
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
    • -6
    • +4
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
    • -6
    • +23
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/ClearSessionController.java
    • -28
    • +28
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
    • -482
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringAction.java
    • -0
    • +441
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_task/web/pages/authoring/authoring.jsp
    • -9
    • +9
    /lams_tool_task/web/pages/learning/learning.jsp
    • -5
    • +6
    /lams_tool_task/web/pages/learning/parts/addtask.jsp
    • -4
    • +2
    /lams_tool_task/web/pages/learning/parts/filelist.jsp
    • -1
    • +1
    /lams_tool_task/web/pages/learning/parts/itemdetails.jsp
    • -3
    • +3
    /lams_tool_task/web/pages/learning/parts/notebook.jsp
    • -7
    • +7
    /lams_tool_task/web/pages/learning/submissionDeadline.jsp
    • -2
    • +2
    /lams_tool_task/web/pages/monitoring/editactivity.jsp
    • -4
    • +4
    /lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp
12:08 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4607 LDEV-4593 and LDEV-4614

Adding policy and consent labels, No score labels for gradebook in authoring, removing country labels as they moved to lams_common

Options
    • -7
    • +27
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -274
    • +25
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +21
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
Thursday 05 Jul 2018
11:58 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4593: Adding English labels. LDEV-4605: removing country list from admin

Options
    • -18
    • +22
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -255
    • +33
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
11:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4593: Adding Spanish labels

Options
    • -2
    • +32
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
11:33 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4614: Moving labels around

Moving labels for countries out of lams_admin and lams_central to lams_common instead.

Options
    • -251
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -251
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -252
    • +3
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -251
    • +2
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +251
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -2
    • +251
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +251
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +251
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
8:04 pm

Andrey Balan

Merge branch 'LDEV-4614'

Options
    • binary
    /lams_build/lib/lams/lams.jar
8:02 pm

Andrey Balan

LDEV-4614 Sort country list by name rather than code

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -2
    • +2
    /lams_admin/web/user.jsp
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -2
    • +2
    /lams_central/web/signup/singupTab.jsp
    • -22
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
4:59 pm

Andrey Balan

Merge branch 'LDEV-4620'

Options
4:58 pm

Andrey Balan

LDEV-4620 Include tool name to a log event description

Options
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
2:24 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4611: minor UI changes

Removing label improved layout

Options
    • -2
    • +2
    /lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp
9:35 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4612 Mindmap has full screen mode.

Options
    • -0
    • +67
    /lams_central/web/css/_learner_base.scss
    • -0
    • +54
    /lams_central/web/includes/javascript/fullscreen.js
    • -65
    • +0
    /lams_monitoring/web/css/timer.scss
    • -54
    • +3
    /lams_monitoring/web/timer.jsp
    • -4
    • +19
    /lams_tool_mindmap/web/common/mapjs.jsp
    • -1
    • +15
    /lams_tool_mindmap/web/includes/css/mindmap.scss
    • -0
    • +1
    /lams_tool_mindmap/web/pages/authoring/authoring.jsp
    • -0
    • +1
    /lams_tool_mindmap/web/pages/learning/mindmap.jsp
    • -0
    • +1
    /lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
5:05 am

Andrey Balan

Merge branch 'LDEV-4620'

Options
    • binary
    /lams_build/lib/lams/lams.jar
4:56 am

Andrey Balan

LDEV-4620 Submit Files tool to log release marks event

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180704.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java
    • -29
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
    • -14
    • +3
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
4:55 am

Andrey Balan

LDEV-4620 Change return type of getLessonActivityIdsForToolContentId

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -3
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
Wednesday 04 Jul 2018
11:42 pm

Ernie Ghiglione <ernieg@gmail.com>

Merge branch 'master' of github.com:lamsfoundation/lams

Options
11:42 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4611: minor UI changes

Options
    • -1
    • +2
    /lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
    • -1
    • +2
    /lams_tool_sbmt/web/monitoring/mark/mark.jsp
    • -1
    • +2
    /lams_tool_sbmt/web/monitoring/parts/summary.jsp
10:23 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started learning migration

Options
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java
    • -51
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/ClearSessionAction.java
    • -0
    • +53
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/ClearSessionController.java
    • -790
    • +732
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
    • -2
    • +2
    /lams_tool_task/web/pages/authoring/authoring.jsp
    • -1
    • +1
    /lams_tool_task/web/pages/authoring/parts/addtask.jsp
    • -7
    • +9
    /lams_tool_task/web/pages/learning/parts/addtask.jsp
    • -3
    • +3
    /lams_tool_task/web/pages/learning/parts/filelist.jsp
    • -7
    • +7
    /lams_tool_task/web/pages/learning/parts/itemdetails.jsp
    • -5
    • +5
    /lams_tool_task/web/pages/learning/parts/notebook.jsp
    • -7
    • +7
    /lams_tool_task/web/pages/learning/submissionDeadline.jsp
5:31 pm

Andrey Balan

Merge branch 'LDEV-4610'

Options
5:31 pm

Andrey Balan

LDEV-4610 Remove tooltips from jqGrid in gradebook

Options
    • -27
    • +27
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -22
    • +22
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -16
    • +13
    /lams_gradebook/web/gradebookMonitor.jsp
    • -77
    • +0
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
5:08 pm

Andrey Balan

Merge branch 'LDEV-4611'

Options
4:53 pm

Andrey Balan

LDEV-4611 minor changes to release marks feature

* Slightly modify CSS of release mark alert message

* Don't display old message at the top of a page on releasing marks

Options
    • -12
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
    • -11
    • +14
    /lams_tool_sbmt/web/monitoring/parts/summary.jsp
8:00 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4501 adding missing labels

Options
    • -2
    • +5
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
6:20 am

Andrey Balan

Merge branch 'LDEV-4611'

Options
6:18 am

Andrey Balan

LDEV-4611 Release marks auto pushes marks to gradebook now

Release marks needs to be a "state" within the tool rather than

something that is transient. If this option is marks are already

released, then marks entered in SF monitor should be auto pushed to

monitor and disclosed to students via SF learner.

Also once you release marks you should not be able to unrelease them.

View all marks page should also state the release marks state.

Options
    • -9
    • +0
    /lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
    • -0
    • +8
    /lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
    • -0
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
    • -20
    • +4
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
    • -0
    • +10
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
    • -0
    • +21
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180702.sql
    • -17
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
    • -3
    • +10
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SessionDTO.java
    • -16
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java
    • -194
    • +168
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -39
    • +19
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
    • -20
    • +17
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
    • -3
    • +3
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
    • -0
    • +6
    /lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
  16. … 3 more files in changeset.
6:17 am

Andrey Balan

LDEV-4611 Code clean up

Options
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java
    • -17
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
    • -4
    • +5
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
    • -2
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java
    • -45
    • +11
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java
    • -21
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java
    • -7
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java
    • -1
    • +0
    /lams_tool_sbmt/web/monitoring/monitoring.jsp
Tuesday 03 Jul 2018
3:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605: Adding country list in Greek

Options
    • -2
    • +255
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
2:57 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605: Adding country list in Greek

Options
    • -2
    • +251
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
2:49 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605: Adding country list in Spanish

Adding country list in Español

Options
    • -2
    • +251
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +256
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties