Activity lams/

From a tip from a Fiona, the context path "rams/" or "lams/' is actually stored in the db, so we can get it from there instead of getting it from the context of the request

- -15
- +8
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
/lams_learning/src/.../MainExportServlet.java

10:27 am

Marcin Cieslak

More
MAIN:marcin:20081103022701
changed 2 files
MAIN

LDEV-1945, LDEV-1944: Changed a variable name to comply with the last commit for text search based conditions.

- -2
- +2
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatCondition.java
- -3
- +3
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumCondition.java

10:15 am

Marcin Cieslak

More
MAIN:marcin:20081103021527
changed 1 file
MAIN

LDEV-1606: Changed regex to properly pick up commas, fullstops etc.

- -18
- +25
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
- History
- Source
- Diff
/lams_common/src/.../TextSearchCondition.java

10:07 am

paulg

More
MAIN:paulg:20081103020728
changed 4 files
MAIN

LDEV-1829 After lots of console outputting... two tiny changes made to two classes

Branching previewing working now

- -2
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as
- -9
- +9
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasActivity.as
- binary
/lams_monitoring/web/lams_monitoring.swf
- History
- Source
- Diff
/lams_monitoring/web/lams_monitoring.swf
- binary
/lams_monitoring/web/lams_monitoring_library.swf
- History
- Source
- Diff
/lams_monitoring/.../lams_monitoring_library.swf

7:36 am

lfoxton

More
MAIN:lfoxton:20081102233635
changed 1 file
MAIN

LDEV-1984 history only shows first name twice

- -1
- +1
/lams_tool_wiki/web/pages/learning/wiki.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/.../learning/wiki.jsp

9:15 am

Andrey Balan

More
MAIN:andreyb:20081102011511
changed 70 files
MAIN

LDEV-1959

scratch learner UI

* jQuery Galleria used as a base

* jCarousel wired up

* jquery.rating wired up

* support for comments

- -20
- +26
/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_images/.../ApplicationResources_en_AU.properties
- -14
- +21
/lams_tool_images/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_images/conf/.../struts-actions.xml
- -0
- +11
/lams_tool_images/db/sql/create_lams_tool_imageGallery.sql
- History
- Source
- Diff
/lams_tool_images/.../create_lams_tool_imageGallery.sql
- -0
- +6
/lams_tool_images/db/sql/table-schema.sql
- History
- Source
- Diff
/lams_tool_images/db/sql/table-schema.sql
- -7
- +11
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
- History
- Source
- Diff
/lams_tool_images/.../ImageGalleryConstants.java
- -0
- +6
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
- History
- Source
- Diff
/lams_tool_images/.../imageGalleryApplicationContext.xml
- -0
- +35
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageCommentDAO.java
- History
- Source
/lams_tool_images/src/.../dao/ImageCommentDAO.java
- -2
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java
- History
- Source
- Diff
/lams_tool_images/.../ImageGalleryItemVisitDAO.java
- -0
- +38
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java
- History
- Source
/lams_tool_images/.../ImageCommentDAOHibernate.java
- -5
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java
- History
- Source
- Diff
/lams_tool_images/.../ImageGalleryItemVisitDAOHibernate.java
- -7
- +2
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
- History
- Source
- Diff
/lams_tool_images/src/.../dto/Summary.java
- -0
- +62
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml
- History
- Source
/lams_tool_images/src/.../ImageComment.hbm.xml
- -0
- +136
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java
- History
- Source
/lams_tool_images/src/.../model/ImageComment.java
- -16
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
- History
- Source
- Diff
/lams_tool_images/src/.../ImageGallery.java
- -0
- +20
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml
- History
- Source
- Diff
/lams_tool_images/.../ImageGalleryItem.hbm.xml
… 55 more files in changeset.

1:57 pm

Marcin Cieslak

More
MAIN:marcin:20081031055726
changed 12 files
MAIN

LDEV-1946, LDEV-1945, LDEV-1944, LDEV-1918, LDEV-1926: Added default conditions as a part of tool's default content. Removed unnecessary call to DAO.

- -8
- +17
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
- History
- Source
- Diff
/lams_tool_chat/.../ChatOutputFactory.java
- -9
- +6
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatService.java
- -17
- +30
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
- History
- Source
- Diff
/lams_tool_forum/.../ForumOutputFactory.java
- -10
- +6
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -1
- +3
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../IQaService.java
- -11
- +25
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaOutputFactory.java
- -13
- +21
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaServicePOJO.java
- -1
- +4
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaStarterAction.java
- -9
- +18
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookOutputFactory.java
- -9
- +5
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookService.java
- -12
- +28
/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
- History
- Source
- Diff
/lams_tool_survey/.../SurveyOutputFactory.java
- -9
- +5
/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
- History
- Source
- Diff
/lams_tool_survey/.../SurveyServiceImpl.java

1:51 pm

Marcin Cieslak

More
MAIN:marcin:20081031055127
changed 4 files
MAIN

LDEV-1299: Modified monitoring for condition gates.

- -2
- +3
/lams_monitoring/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_monitoring/.../ApplicationResources.properties
- -2
- +3
/lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_monitoring/.../ApplicationResources_en_AU.properties
- -7
- +7
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
- History
- Source
- Diff
/lams_monitoring/src/.../web/GateAction.java
- -7
- +77
/lams_monitoring/web/gate/conditionGateContent.jsp
- History
- Source
- Diff
/lams_monitoring/.../conditionGateContent.jsp

1:39 pm

dcarlier

More
MAIN:dcarlier:20081031053920
changed 3 files
MAIN

LDEV-1989 Stopped author from doing cut/copy/paste (keyboard shortcut) actions on activities when a dialog is open as it was messing with cut/copy/paste of text in the dialogs

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -4
- +9
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Application.as

12:03 pm

dcarlier

More
MAIN:dcarlier:20081031040326
changed 1 file
MAIN

LDEV-1974 Removed unwanted text

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

12:02 pm

lfoxton

More
MAIN:lfoxton:20081031040210
changed 1 file
MAIN

Updating jquery-latest.pack.js to 1.2.6 to cater for the new ui dialog widget

- -5
- +5
/lams_central/web/includes/javascript/jquery-latest.pack.js
- History
- Source
- Diff
/lams_central/web/.../jquery-latest.pack.js

12:01 pm

lfoxton

More
MAIN:lfoxton:20081031040112
added 7 files
MAIN

Adding jQuery dialog widget to central

- -0
- +150
/lams_central/web/css/jquery-ui/dialog.css
- History
- Source
/lams_central/web/css/jquery-ui/dialog.css
- binary
/lams_central/web/css/jquery-ui/images/222222_11x11_icon_close.gif
- History
- Source
/lams_central/web/.../222222_11x11_icon_close.gif
- binary
/lams_central/web/css/jquery-ui/images/222222_11x11_icon_resize_se.gif
- History
- Source
/lams_central/.../222222_11x11_icon_resize_se.gif
- binary
/lams_central/web/css/jquery-ui/images/454545_11x11_icon_close.gif
- History
- Source
/lams_central/web/.../454545_11x11_icon_close.gif
- binary
/lams_central/web/css/jquery-ui/images/888888_11x11_icon_close.gif
- History
- Source
/lams_central/web/.../888888_11x11_icon_close.gif
- binary
/lams_central/web/css/jquery-ui/images/e6e6e6_40x100_textures_02_glass_75.png
- History
- Source
/lams_central/.../e6e6e6_40x100_textures_02_glass_75.png
- -0
- +101
/lams_central/web/includes/javascript/jquery-ui/ui.dialog-1.5.2.min.js
- History
- Source
/lams_central/web/.../ui.dialog-1.5.2.min.js

11:53 am

dcarlier

More
MAIN:dcarlier:20081031035341
changed 3 files
MAIN

LDEV-1974 Updated flash player detection script to adobe detection kit

- -11
- +10
/lams_central/web/login.jsp
- History
- Source
- Diff
/lams_central/web/login.jsp
- -0
- +276
/lams_central/web/includes/javascript/AC_OETags.js
- History
- Source
/lams_central/web/.../javascript/AC_OETags.js
- -75
- +0
/lams_central/web/includes/javascript/flash_detect.js
- History
- Source
- Diff
/lams_central/web/.../flash_detect.js

9:41 am

Marcin Cieslak

More
MAIN:marcin:20081031014151
changed 15 files
MAIN

LDEV-1926: Added Notebook text based conditions.

- -1
- +1
/lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml
- History
- Source
- Diff
/lams_tool_notebook/conf/.../Notebook.hbm.xml
- -3
- +3
/lams_tool_notebook/db/model/notebook_tool.clay
- History
- Source
- Diff
/lams_tool_notebook/db/.../notebook_tool.clay
- -1
- +3
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql
- History
- Source
- Diff
/lams_tool_notebook/.../patch20080929_updateFrom21.sql
- -0
- +39
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookConditionDTO.java
- History
- Source
/lams_tool_notebook/.../NotebookConditionDTO.java
- -3
- +4
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java
- History
- Source
- Diff
/lams_tool_notebook/src/.../Notebook.java
- -6
- +31
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookCondition.java
- -0
- +10
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
- History
- Source
- Diff
/lams_tool_notebook/.../INotebookService.java
- -13
- +13
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookOutputFactory.java
- -0
- +6
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookService.java
- -50
- +0
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConditionComparator.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookConditionComparator.java
- -2
- +0
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookConstants.java
- -3
- +20
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_notebook/.../AuthoringAction.java
- -2
- +7
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringNotebookConditionAction.java
- History
- Source
- Diff
/lams_tool_notebook/.../AuthoringNotebookConditionAction.java
- -3
- +3
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookConditionForm.java
- -1
- +44
/lams_tool_notebook/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_tool_notebook/web/.../struts-config.xml

9:06 am

Marcin Cieslak

More
MAIN:marcin:20081031010658
changed 12 files
MAIN

LDEV-1606: Added BranchConditionDTOs specific for each tool. This fixes bug in learning design export.

- -3
- +12
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
- History
- Source
- Diff
/lams_common/src/.../TextSearchCondition.java
- -13
- +14
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
- History
- Source
- Diff
/lams_common/src/.../BranchConditionDTO.java
- -0
- +97
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TextSearchConditionDTO.java
- History
- Source
/lams_common/src/.../TextSearchConditionDTO.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java
- -0
- +40
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatConditionDTO.java
- History
- Source
/lams_tool_chat/src/.../dto/ChatConditionDTO.java
- -2
- +8
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatCondition.java
- -0
- +59
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/ForumConditionDTO.java
- History
- Source
/lams_tool_forum/src/.../ForumConditionDTO.java
- -6
- +17
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumCondition.java
- -3
- +12
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaCondition.java
- -0
- +56
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
- History
- Source
/lams_tool_laqa/src/.../qa/QaConditionDTO.java
- -0
- +60
/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dto/SurveyConditionDTO.java
- History
- Source
/lams_tool_survey/src/.../SurveyConditionDTO.java
- -3
- +16
/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java
- History
- Source
- Diff
/lams_tool_survey/.../SurveyCondition.java

8:57 am

jliew

More
MAIN:jliew:20081031005730
changed 1 file
MAIN

use Sun 120 formatting standard

- -153
- +147
/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
- History
- Source
- Diff
/lams_central/src/.../web/ProfileAction.java

8:54 am

jliew

More
MAIN:jliew:20081031005404
changed 1 file
MAIN

LDEV-1830 don't fail if user's locale is invalid

- -1
- +4
/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
- History
- Source
- Diff
/lams_central/src/.../web/ProfileAction.java

8:12 am

lfoxton

More
MAIN:lfoxton:20081031001241
changed 1 file
MAIN

LDEV-1986 Wiki doesn't enforce minimum number of edits - fixed

- -2
- +4
/lams_tool_wiki/web/pages/learning/wiki.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/.../learning/wiki.jsp

8:03 am

lfoxton

More
MAIN:lfoxton:20081031000354
changed 2 files
MAIN

LDEV-1987 Export portfolio not exporting images

this was related to LDEV-1971:, the image urls were not being adjusted properly in export becuse the "lams/www/secure" url was instead "rams/www/sevure" because this tool was developed in rams.

now the "lams" bit is retrieved from the request context using:

request.getContextPath().substring(0, 5);

- -8
- +17
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../ExportServlet.java
- -3
- +0
/lams_tool_wiki/web/pages/export/exportPortfolio.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/.../exportPortfolio.jsp

8:00 am

lfoxton

More
MAIN:lfoxton:20081031000031
changed 1 file
MAIN

LDEV-1971 : Main export server only adjusts image urls for lams, not in rams,

this is because "/lams/secure/www" was included in the regex

now the "lams" bit is retrieved from the request context using:

request.getContextPath().substring(0, 5);

- -13
- +21
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
/lams_learning/src/.../MainExportServlet.java

lams

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

lfoxton

jliew

jliew

lfoxton

jliew

asukkar

Ernie Ghiglione

Ernie Ghiglione

lfoxton

Marcin Cieslak

lfoxton

Marcin Cieslak

Marcin Cieslak

paulg

lfoxton

Andrey Balan

Marcin Cieslak

Marcin Cieslak

dcarlier

dcarlier

lfoxton

lfoxton

dcarlier

Marcin Cieslak

Marcin Cieslak

jliew

jliew

lfoxton

lfoxton

lfoxton