Fisheye: Diff - lams-github/lams_central/web/outcome/scaleEdit.jsp

Tree
Options

d432ad1

LDEV-4759 Authoring and monitoring tabs working

01 Feb 19 Fiona Malikoff <Fiona.Malikoff@gmail.com> d432ad1e56c019311c8ca428ba8e08907a56077c

Merge branch 'lams31' into LDEV-4440
Conflicts:
lams_admin/web/sessionmaintain.jsp
lams_build/build.xml
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

19 Oct 18 Marcin Cieslak fd2cfad55c7c517931f69334ce644d509ec28140

Loading ...