Fisheye on lams/lams_learning

lams (lams2_2): LDEV-2139 Merge for 2.2.1 - manual sync on the moveToActivity method.

mseaton — Tue, 17 Feb 2009 05:53:22 +0100

mseaton committed lams2_2:mseaton:20090217045322 on branch lams2_2 in lams

LDEV-2139 Merge for 2.2.1 - manual sync on the moveToActivity method.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-15, +45)

| History

| Source

| Diff

asukkar — Fri, 13 Feb 2009 01:49:43 +0100

asukkar committed lams2_2:asukkar:20090213004943 on branch lams2_2 in lams

Replaced indicator dots with loading animation

· /lams_learning/web/exportWaitingPage.jsp

(-1, +1)

| History

| Source

| Diff

Ernie Ghiglione — Fri, 13 Feb 2009 01:43:43 +0100

Ernie Ghiglione committed lams2_2:ernieg:20090213004343 on branch lams2_2 in lams

Updating English

· /lams_learning/conf/language/lams/ApplicationResources.properties	(-3, +3)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-3, +3)	\| History	\| Source	\| Diff

asukkar — Thu, 12 Feb 2009 04:20:16 +0100

asukkar committed lams2_2:asukkar:20090212032016 on branch lams2_2 in lams

Back porting changes from HEAD.

Fixed error in ImageBundler preventing contentFolder from containing sub directories.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/Bundler.java	(-60, +27)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java	(-164, +121)	\| History	\| Source	\| Diff