Activity lams-github/

LDEV-1131: If the user is using a custom stylesheet, export portfolio wasn't copying the images directory for the stylesheet. Changed the export so it now copies the theme's special images (using the new image_directory column in the theme) as well as the default images.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java
- History
- Source
- Diff
/lams_central/src/.../web/ThemeAction.java
- -6
- +2
/lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
- History
- Source
- Diff
/lams_central/src/java/.../tag/CssTag.java
- -0
- +16
/lams_common/db/sql/updatescripts/alter_201_theme.sql
- History
- Source
/lams_common/db/.../alter_201_theme.sql

11:44 am

fmalikoff

More
8bd9b88
changed 14 files
v4.7, v4.8

LDEV-1131: If the user is using a custom stylesheet, export portfolio wasn't copying the images directory for the stylesheet. Changed the export so it now copies the theme's special images (using the new image_directory column in the theme) as well as the default images.

- -1
- +13
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml
- History
- Source
- Diff
/lams_common/.../CSSThemeVisualElement.hbm.xml
- -597
- +604
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay
- -0
- +1
/lams_common/db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
/lams_common/db/.../create_lams_11_tables.sql
- -2
- +2
/lams_common/db/sql/insert_users.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_users.sql
- -1
- +20
/lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java
- History
- Source
- Diff
/lams_common/.../CSSThemeVisualElement.java
- -3
- +13
/lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java
- History
- Source
- Diff
/lams_common/src/.../IThemeService.java
- -4
- +25
/lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java
- History
- Source
- Diff
/lams_common/src/.../ThemeService.java
- -2
- +8
/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
- History
- Source
- Diff
/lams_common/src/.../util/CSSThemeUtil.java
- -1
- +1
/lams_common/test/java/org/lamsfoundation/lams/theme/service/TestThemeService.java
- History
- Source
- Diff
/lams_common/test/.../TestThemeService.java
- -1
- +28
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
- History
- Source
- Diff
/lams_learning/.../ExportPortfolioService.java
- -0
- +7
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
- History
- Source
- Diff
/lams_learning/.../IExportPortfolioService.java
- -35
- +38
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
- History
- Source
- Diff
/lams_learning/src/.../action/CSSBundler.java
- -1
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
/lams_learning/src/.../MainExportServlet.java
- -0
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml

10:42 am

mseaton

More
982babf
changed 1 file
v4.7, v4.8

removed fixed size for logo on login screen

- -1
- +1
/lams_central/web/login.jsp
- History
- Source
- Diff
/lams_central/web/login.jsp

10:19 am

mseaton

More
0c73070
changed 1 file
v4.7, v4.8

mix up with online/offline instructions ldev-1123

- -2
- +2
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_chat/src/.../AuthoringAction.java

4:24 pm

mseaton

More
b4afa75
changed 3 files
v4.7, v4.8

fixed export failure on incorrect EARDir key and empty directory

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java
- -0
- +16
/lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
- History
- Source
- Diff
/lams_common/src/java/.../util/FileUtil.java

1:52 pm

fmalikoff

More
272b627
changed 1 file
v4.7, v4.8

Fixed bugs with CSS code, which was stopping user themes working. The order was wrong (default came second) and it wasn't handling the login page properly.

- -22
- +24
/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
- History
- Source
- Diff
/lams_common/src/.../util/CSSThemeUtil.java

10:12 am

mseaton

More
3444b8f
changed 5 files
v4.7, v4.8

merged changes to HEAD for ldev-1130

- binary
/lams_central/src/flash/lams_learner.fla
- History
- Source
- Diff
/lams_central/src/flash/lams_learner.fla
- -2
- +22
/lams_central/src/flash/org/lamsfoundation/lams/learner/Header.as
- History
- Source
- Diff
/lams_central/src/flash/.../learner/Header.as
- binary
/lams_learning/web/lams_learner.swf
- History
- Source
- Diff
/lams_learning/web/lams_learner.swf
- -0
- +1
/lams_www/build.xml
- History
- Source
- Diff
/lams_www/build.xml
- binary
/lams_www/web/images/learner.logo.swf
- History
- Source
/lams_www/web/images/learner.logo.swf

1:57 pm

lfoxton

More
89f6f79
changed 1 file
v4.7, v4.8

[LI-54] Checks for my.ini in C:\Windows to support Xampp bundles mysql installation

- -2
- +5
/win_installer/src/installer.nsi
- History
- Source
- Diff
/win_installer/src/installer.nsi

12:32 pm

lfoxton

More
a3a5886
changed 2 files
v4.7, v4.8

[LI-55] * Change the language pack and future installers to add a "\" to the path before trying to call mysql. * Change future installers to add the "\" automatically before saving in the registry.