Fisheye: Diff - lams-github/lams

Tree
Options

fd2cfad

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

2e97a50

LDEV-4662 Rewrite main Ant build file
lams-cruise was renamed to deploy-lams as there is no Cruise Control
anymore. Some tasks were made internal as they are unlikely to be run
manually. deploy-lams-all-tools was added mainly for development.

23 Sep 18 Marcin Cieslak 2e97a50e3262b251f5b0adaf53f392d43648ebdf

Loading ...