• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added some more asserts to help track down a null ptr exception

Added java memory arguments - the tests sometimes fail with out of memory errors.

Move 2 classess into *.web.util package instead of *.web package.

  1. … 8 more files in changeset.
Change password screen display.

    • -0
    • +1
    ./conf/xdoclet/struts-message-resources.xml
    • -1
    • +6
    ./web/WEB-INF/struts/struts-config.xml
Move login/index stuff from Lams_common

Move login/index stuff from Lams_common

    • -0
    • +7
    ./conf/xdoclet/struts-plugins.xml
    • -0
    • +116
    ./src/java/org/lamsfoundation/lams/security/NestableGroup.java
    • -0
    • +113
    ./src/java/org/lamsfoundation/lams/security/SimpleGroup.java
    • -0
    • +222
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
  1. … 5 more files in changeset.
Move login/index stuff from Lams_common

Add tld from STRTUS and JSTL

Move login/index stuff from Lams_common

    • -0
    • +8
    ./conf/xdoclet/listeners.xml
    • -0
    • +26
    ./conf/xdoclet/web-security.xml
    • -0
    • +24
    ./web/adminHeader.jsp
    • -0
    • +11
    ./web/errorContent.jsp
    • -0
    • +148
    ./web/indexContent.jsp
    • -0
    • +77
    ./web/loginContent.jsp
    • -0
    • +18
    ./web/loginHeader.jsp
    • -0
    • +51
    ./web/passwordChangeContent.jsp
    • -0
    • +22
    ./web/passwordChangeOkContent.jsp
  1. … 29 more files in changeset.
Workspace xml file wasn't being included in jar file.

Merge Lams_authoring and Lams_workspace.

    • binary
    ./docs/LAMS_Learner_Guide_b60.pdf
    • binary
    ./web/doc/LAMS_Learner_Guide_b60.pdf
Merge Lams_authoring and Lams_workspace.

  1. … 2 more files in changeset.
Merge Lams_authoring and Lams_workspace.

    • -0
    • +3
    ./conf/jar/META-INF/MANIFEST.MF
    • -0
    • +2
    ./conf/war/META-INF/MANIFEST.MF
    • -0
    • +30
    ./conf/xdoclet/servlet-mappings.xml
    • -0
    • +62
    ./conf/xdoclet/servlets.xml
    • -0
    • +77
    ./conf/xdoclet/taglibs.xml
    • -0
    • +35
    ./conf/xdoclet/web-settings.xml
    • binary
    ./src/flash/common.swf
    • binary
    ./src/flash/lams_authoring.fla
    • -0
    • +1
    ./src/flash/sampleLearningDesign.xml
  1. … 85 more files in changeset.
v2108200501

changed the default toolbar to a limited set, instead of the original default toolbar

added FCKeditor Connector and Upload Servlet COnfiguration settings. These were previously placed in individual tool's web.xml, however they can now be removed.

jsp folder not needed. checked into cvs by mistake

update from fckEditor 2.0 fc to fckEditor 2.0

    • -32
    • +32
    ./web/fckeditor/fcktemplates.xml
    • -5
    • +35
    ./web/fckeditor/editor/_source/internals/fck.js
    • -3
    • +114
    ./web/fckeditor/editor/_source/internals/fck_1.js
    • -17
    • +58
    ./web/fckeditor/editor/_source/internals/fck_2.js
  1. … 152 more files in changeset.
under the ant target build-war, changed the directory name of fckEditor to fckeditor

changed the directory name from fckEditor to fckeditor (all lowercase)

    • -0
    • +148
    ./web/fckeditor/fckconfig.js
    • -0
    • +167
    ./web/fckeditor/fckeditor.js
    • -0
    • +46
    ./web/fckeditor/fckstyles.xml
    • -0
    • +78
    ./web/fckeditor/fcktemplates.xml
    • -0
    • +4
    ./web/fckeditor/editor/fckblank.html
    • -0
    • +106
    ./web/fckeditor/editor/fckdebug.html
    • -0
    • +306
    ./web/fckeditor/editor/fckdialog.html
    • -0
    • +56
    ./web/fckeditor/editor/fckeditor.html
    • -0
    • +73
    ./web/fckeditor/editor/fckeditor.original.html
    • -0
    • +69
    ./web/fckeditor/editor/_source/classes/fckcontextmenugroup.js
    • -0
    • +102
    ./web/fckeditor/editor/_source/classes/fckcontextmenuitem.js
    • -0
    • +48
    ./web/fckeditor/editor/_source/classes/fckevents.js
    • -0
    • +202
    ./web/fckeditor/editor/_source/classes/fckpanel_gecko.js
    • -0
    • +76
    ./web/fckeditor/editor/_source/classes/fckpanel_ie.js
  1. … 768 more files in changeset.
Add aurhoring 3 tabs stuff:

1.Tab images

2. Updated CSS

3. tabcontrol.js

4. Updated build.xml

    • binary
    ./web/images/aqua_tab.gif
    • binary
    ./web/images/aqua_tab_centre.gif
    • binary
    ./web/images/aqua_tab_left.gif
    • binary
    ./web/images/aqua_tab_right.gif
    • binary
    ./web/images/aqua_tab_s_centre.gif
    • binary
    ./web/images/aqua_tab_s_left.gif
    • binary
    ./web/images/aqua_tab_s_right.gif
    • binary
    ./web/images/aqua_tab_selected.gif
    • -0
    • +118
    ./web/includes/javascript/tabcontroller.js
Removed unnecessary parameters

Added the Instructions popup window needed for the downloading of instructions files.

Upgraded to Struts 1.2.7

    • -0
    • +408
    ./web/WEB-INF/struts/struts-config_1_0.dtd
    • -0
    • +695
    ./web/WEB-INF/struts/struts-config_1_1.dtd
    • -0
    • +686
    ./web/WEB-INF/struts/struts-config_1_2.dtd
    • -0
    • +270
    ./web/WEB-INF/struts/struts-html-el.tld
    • -0
    • +270
    ./web/WEB-INF/struts/struts-html.tld
    • -0
    • +285
    ./web/WEB-INF/struts/struts-nested.tld
    • -0
    • +281
    ./web/WEB-INF/struts/tiles-config_1_1.dtd
    • -0
    • +313
    ./web/WEB-INF/struts/validator-rules.xml
    • -0
    • +565
    ./web/WEB-INF/struts/web-app_2_2.dtd
    • -0
    • +1059
    ./web/WEB-INF/struts/web-app_2_3.dtd
  1. … 5 more files in changeset.
Added tool icons. These have come from Dave, and are yet to reconciled to our list of tools.

    • binary
    ./web/images/icon_chat.swf
    • binary
    ./web/images/icon_chatgroupreporting.swf
    • binary
    ./web/images/icon_doublereflectivequestion.swf
    • binary
    ./web/images/icon_group.swf
    • binary
    ./web/images/icon_groupreporting.swf
    • binary
    ./web/images/icon_htmlnb.swf
    • binary
    ./web/images/icon_imagegallery.swf
    • binary
    ./web/images/icon_imageranking.swf
    • binary
    ./web/images/icon_journal.swf
    • binary
    ./web/images/icon_messageboard.swf
    • binary
    ./web/images/icon_noticeboard.swf
    • binary
    ./web/images/icon_ranking.swf
    • binary
    ./web/images/icon_reflectivequestion.swf
    • binary
    ./web/images/icon_reflectiveranking.swf
    • binary
    ./web/images/icon_reportsubmission.swf
  1. … 7 more files in changeset.
*** empty log message ***

    • -0
    • +140
    ./web/css/default.css
  1. … 7 more files in changeset.
Now creates the build directory as needed - this was causing the master build to fail.

Made lams_authoring and lams_workspace work with the ear.

  1. … 1 more file in changeset.
Added new stylesheets and examples of how to use

    • -0
    • +140
    ./web/css/aqua.css
    • -0
    • +80
    ./web/lams_example_tool/author_page.html
    • -0
    • +3
    ./web/lams_example_tool/css/tool_custom.css
Changed build and class paths to use shared libraries