Fisheye: Diff - lams-github/lams

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

d961ba2

LDEV-3322: resucitating selenium tests
Readapting the old lams_test to LAMS 3.x

28 Aug 18 Ernie Ghiglione <ernieg@gmail.com> d961ba28b63782744357d367fddb26ecc5701a1e

Loading ...