Fisheye: Diff - lams-github/lams_gradebook/web/gradebookMonitor.jsp

Tree
Options

54a1430

Merge remote-tracking branch 'origin/LDEV-4644'
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
lams_central/web/WEB-INF/struts-config.xml
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
lams_gradebook/web/gradebookMonitor.jsp
lams_monitoring/conf/language/lams/ApplicationResources.properties

19 Oct 18 Marcin Cieslak 54a14306d3b36e6da9aedbaa6700c91048ebc53a

7de1c6f

Merge remote-tracking branch 'origin/LDEV-4609'
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
lams_gradebook/web/gradebookMonitor.jsp

19 Oct 18 Marcin Cieslak 7de1c6fbf11121cbf61e6aceca6b4e063d5ffc7a

Loading ...