Activity lams-github/

LDEV-3453: Alert, confirm and prompt JS functions do not decode i18n labels properly (quotes are still HTML entities). This trick decodes the labels before setting them as JS variables.

- -3
- +5
/lams_admin/web/toolcontent/learningLibraryGroup.jsp
- History
- Source
- Diff
/lams_admin/web/.../learningLibraryGroup.jsp
- -43
- +45
/lams_central/web/authoring/authoring.jsp
- History
- Source
- Diff
/lams_central/web/authoring/authoring.jsp
- -2
- +9
/lams_central/web/main.jsp
- History
- Source
- Diff
/lams_central/web/main.jsp
- -4
- +5
/lams_central/web/orgGroup.jsp
- History
- Source
- Diff
/lams_central/web/orgGroup.jsp
- -2
- +4
/lams_central/web/orgGrouping.jsp
- History
- Source
- Diff
/lams_central/web/orgGrouping.jsp
- -12
- +13
/lams_monitoring/web/monitor.jsp
- History
- Source
- Diff
/lams_monitoring/web/monitor.jsp

6:43 pm

Marcin Cieslak

More
d68cf5c
changed 6 files

LDEV-3453: Alert, confirm and prompt JS functions do not decode i18n labels properly (quotes are still HTML entities). This trick decodes the labels before setting them as JS variables.

- -3
- +5
/lams_admin/web/toolcontent/learningLibraryGroup.jsp
- History
- Source
- Diff
/lams_admin/web/.../learningLibraryGroup.jsp
- -43
- +45
/lams_central/web/authoring/authoring.jsp
- History
- Source
- Diff
/lams_central/web/authoring/authoring.jsp
- -2
- +3
/lams_central/web/main.jsp
- History
- Source
- Diff
/lams_central/web/main.jsp
- -4
- +5
/lams_central/web/orgGroup.jsp
- History
- Source
- Diff
/lams_central/web/orgGroup.jsp
- -2
- +4
/lams_central/web/orgGrouping.jsp
- History
- Source
- Diff
/lams_central/web/orgGrouping.jsp
- -12
- +13
/lams_monitoring/web/monitor.jsp
- History
- Source
- Diff
/lams_monitoring/web/monitor.jsp

5:48 pm

Marcin Cieslak

More
09a175b
changed 4 files
v4.7, v4.8

LDEV-3466: Make Monitor dialogs non-modal and resizable.

- -14
- +38
/lams_central/web/includes/javascript/groupDisplay.js
- History
- Source
- Diff
/lams_central/web/.../groupDisplay.js
- -4
- +1
/lams_monitoring/web/css/monitorLesson.css
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.css
- -14
- +77
/lams_monitoring/web/includes/javascript/monitorLesson.js
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.js
- -1
- +1
/lams_monitoring/web/monitor.jsp
- History
- Source
- Diff
/lams_monitoring/web/monitor.jsp

5:48 pm

Marcin Cieslak

More
b5d6e74
changed 34 files
v4.7, v4.8

LDEV-3467: New jQuery files, images and layout adjustments.

- -208
- +971
/lams_central/web/css/jquery-ui-redmond-theme.css
- History
- Source
- Diff
/lams_central/.../jquery-ui-redmond-theme.css
- -208
- +971
/lams_central/web/css/jquery-ui-smoothness-theme.css
- History
- Source
- Diff
/lams_central/.../jquery-ui-smoothness-theme.css
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_flat_0_aaaaaa_40x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_flat_0_aaaaaa_40x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_flat_55_fbec88_40x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_flat_55_fbec88_40x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_glass_75_d0e5f5_1x400.png
- History
- Source
- Diff
/lams_central/.../ui-bg_glass_75_d0e5f5_1x400.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_glass_85_dfeffc_1x400.png
- History
- Source
- Diff
/lams_central/.../ui-bg_glass_85_dfeffc_1x400.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_glass_95_fef1ec_1x400.png
- History
- Source
- Diff
/lams_central/.../ui-bg_glass_95_fef1ec_1x400.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_gloss-wave_55_5c9ccc_500x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_gloss-wave_55_5c9ccc_500x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_inset-hard_100_f5f8f9_1x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_inset-hard_100_f5f8f9_1x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_inset-hard_100_fcfdfd_1x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_inset-hard_100_fcfdfd_1x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_217bc0_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_217bc0_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_2e83ff_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_2e83ff_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_469bdd_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_469bdd_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_6da8d5_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_6da8d5_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_cd0a0a_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_cd0a0a_256x240.png
… 19 more files in changeset.

5:41 pm

Marcin Cieslak

More
982c9ef
changed 4 files

LDEV-3466: Make Monitor dialogs non-modal and resizable.

- -13
- +37
/lams_central/web/includes/javascript/groupDisplay.js
- History
- Source
- Diff
/lams_central/web/.../groupDisplay.js
- -4
- +1
/lams_monitoring/web/css/monitorLesson.css
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.css
- -14
- +77
/lams_monitoring/web/includes/javascript/monitorLesson.js
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.js
- -1
- +1
/lams_monitoring/web/monitor.jsp
- History
- Source
- Diff
/lams_monitoring/web/monitor.jsp

5:41 pm

Marcin Cieslak

More
c3bd562
changed 34 files

LDEV-3467: New jQuery files, images and layout adjustments.

- -208
- +971
/lams_central/web/css/jquery-ui-redmond-theme.css
- History
- Source
- Diff
/lams_central/.../jquery-ui-redmond-theme.css
- -208
- +971
/lams_central/web/css/jquery-ui-smoothness-theme.css
- History
- Source
- Diff
/lams_central/.../jquery-ui-smoothness-theme.css
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_flat_0_aaaaaa_40x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_flat_0_aaaaaa_40x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_flat_55_fbec88_40x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_flat_55_fbec88_40x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_glass_75_d0e5f5_1x400.png
- History
- Source
- Diff
/lams_central/.../ui-bg_glass_75_d0e5f5_1x400.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_glass_85_dfeffc_1x400.png
- History
- Source
- Diff
/lams_central/.../ui-bg_glass_85_dfeffc_1x400.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_glass_95_fef1ec_1x400.png
- History
- Source
- Diff
/lams_central/.../ui-bg_glass_95_fef1ec_1x400.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_gloss-wave_55_5c9ccc_500x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_gloss-wave_55_5c9ccc_500x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_inset-hard_100_f5f8f9_1x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_inset-hard_100_f5f8f9_1x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-bg_inset-hard_100_fcfdfd_1x100.png
- History
- Source
- Diff
/lams_central/.../ui-bg_inset-hard_100_fcfdfd_1x100.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_217bc0_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_217bc0_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_2e83ff_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_2e83ff_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_469bdd_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_469bdd_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_6da8d5_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_6da8d5_256x240.png
- binary
/lams_central/web/images/css/jquery-ui-redmond-theme/ui-icons_cd0a0a_256x240.png
- History
- Source
- Diff
/lams_central/.../ui-icons_cd0a0a_256x240.png
… 19 more files in changeset.

5:23 am

Andrey Balan

More
0cf0678
changed 4 files

LDEV-3450 further development of rating/comments feature

- -1
- +0
/lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
- History
- Source
- Diff
/lams_central/src/.../web/RatingServlet.java
- -0
- +5
/lams_central/web/css/jquery.jRating.css
- History
- Source
- Diff
/lams_central/web/css/jquery.jRating.css
- -1
- +1
/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_images/.../ApplicationResources_en_AU.properties
- -52
- +31
/lams_tool_images/web/WEB-INF/tags/Rating.tag
- History
- Source
- Diff
/lams_tool_images/web/.../tags/Rating.tag

1:57 am

Andrey Balan

More
f36eb07
changed 2 files

LDEV-3465 fixed incorrect rendering of statistics tab

- -1
- +1
/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_daco/src/.../MonitoringAction.java
- -10
- +12
/lams_tool_daco/web/pages/monitoring/statistics.jsp
- History
- Source
- Diff
/lams_tool_daco/web/.../statistics.jsp

11:19 pm

LDEV-3450 User uploaded image is not allowed to comment or rate this image. Although he should be able to see comments and rates left by others. Added proper handling of multiline and containing scripts comments.

- -1
- +2
/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_images/.../ApplicationResources_en_AU.properties
- -8
- +38
/lams_tool_images/web/WEB-INF/tags/Rating.tag
- History
- Source
- Diff
/lams_tool_images/web/.../tags/Rating.tag
- -4
- +4
/lams_tool_images/web/pages/learning/parts/commentsarea.jsp
- History
- Source
- Diff
/lams_tool_images/web/.../commentsarea.jsp

6:00 pm

Marcin Cieslak

More
21ce4d0
changed 26 files
v4.7, v4.8

LDEV-3095: Revert incorrect fix. Try to mute cross-domain iframe access errors, as requested by a client.

- -6
- +8
/lams_tool_chat/web/pages/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../conditionList.jsp
- -6
- +8
/lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
- History
- Source
- Diff
/lams_tool_daco/web/.../questionlist.jsp
- -6
- +8
/lams_tool_forum/web/jsps/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../conditionList.jsp
- -6
- +8
/lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiclist.jsp
- -6
- +8
/lams_tool_images/web/pages/authoring/parts/itemlist.jsp
- History
- Source
- Diff
/lams_tool_images/web/.../parts/itemlist.jsp
- -6
- +8
/lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
- History
- Source
- Diff
/lams_tool_imscc/web/.../parts/itemlist.jsp
- -6
- +8
/lams_tool_laqa/web/authoring/addCondition.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../addCondition.jsp
- -6
- +8
/lams_tool_laqa/web/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../conditionList.jsp
- -6
- +8
/lams_tool_laqa/web/authoring/itemlist.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../itemlist.jsp
- -7
- +9
/lams_tool_laqa/web/authoring/newQuestionBox.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../newQuestionBox.jsp
- -6
- +8
/lams_tool_notebook/web/pages/authoring/addCondition.jsp
- History
- Source
- Diff
/lams_tool_notebook/web/.../addCondition.jsp
- -6
- +8
/lams_tool_notebook/web/pages/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_notebook/web/.../conditionList.jsp
- -6
- +8
/lams_tool_scribe/web/pages/authoring/headingForm.jsp
- History
- Source
- Diff
/lams_tool_scribe/web/.../headingForm.jsp
- -6
- +8
/lams_tool_scribe/web/pages/authoring/headingResponse.jsp
- History
- Source
- Diff
/lams_tool_scribe/web/.../headingResponse.jsp
- -6
- +8
/lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
- History
- Source
- Diff
/lams_tool_spreadsheet/web/.../editmark.jsp
… 11 more files in changeset.

5:45 pm

Marcin Cieslak

More
7f72623
changed 27 files

LDEV-3095: Revert incorrect fix. Try to mute cross-domain iframe access errors, as requested by a client.

- -6
- +8
/lams_tool_chat/web/pages/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../conditionList.jsp
- -6
- +8
/lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
- History
- Source
- Diff
/lams_tool_daco/web/.../questionlist.jsp
- -6
- +8
/lams_tool_forum/web/jsps/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../conditionList.jsp
- -6
- +8
/lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiclist.jsp
- -6
- +8
/lams_tool_images/web/pages/authoring/parts/itemlist.jsp
- History
- Source
- Diff
/lams_tool_images/web/.../parts/itemlist.jsp
- -6
- +8
/lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
- History
- Source
- Diff
/lams_tool_imscc/web/.../parts/itemlist.jsp
- -6
- +8
/lams_tool_laqa/web/authoring/addCondition.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../addCondition.jsp
- -6
- +8
/lams_tool_laqa/web/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../conditionList.jsp
- -6
- +8
/lams_tool_laqa/web/authoring/itemlist.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../itemlist.jsp
- -7
- +9
/lams_tool_laqa/web/authoring/newQuestionBox.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../newQuestionBox.jsp
- -6
- +8
/lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../parts/itemlist.jsp
- -6
- +8
/lams_tool_notebook/web/pages/authoring/addCondition.jsp
- History
- Source
- Diff
/lams_tool_notebook/web/.../addCondition.jsp
- -6
- +8
/lams_tool_notebook/web/pages/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_notebook/web/.../conditionList.jsp
- -6
- +8
/lams_tool_scribe/web/pages/authoring/headingForm.jsp
- History
- Source
- Diff
/lams_tool_scribe/web/.../headingForm.jsp
- -6
- +8
/lams_tool_scribe/web/pages/authoring/headingResponse.jsp
- History
- Source
- Diff
/lams_tool_scribe/web/.../headingResponse.jsp
… 12 more files in changeset.

8:10 am

Andrey Balan

More
81eee2b
changed 1 file

LDEV-3450 fix sql

- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040041.sql
- History
- Source
- Diff
/lams_common/src/.../patch02040041.sql

6:42 am

Andrey Balan

More
f026a3c
changed 27 files

LDEV-3450 1) Display what rate you have given 2) Rate only once 3) Don't see the average rating until you rate it. 4) Add an option for a brief comment

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -18
- +38
/lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
- History
- Source
- Diff
/lams_central/src/.../web/RatingServlet.java
- -1
- +9
/lams_central/web/css/jquery.jRating.css
- History
- Source
- Diff
/lams_central/web/css/jquery.jRating.css
- -0
- +75
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
- History
- Source
/lams_common/conf/.../rating/RatingComment.hbm.xml
- -0
- +8
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingCriteria.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../RatingCriteria.hbm.xml
- -0
- +6
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml
- -0
- +16
/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040041.sql
- History
- Source
- Diff
/lams_common/src/.../patch02040041.sql
- -0
- +43
/lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCommentDAO.java
- History
- Source
/lams_common/src/.../dao/IRatingCommentDAO.java
- -8
- +5
/lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
- History
- Source
- Diff
/lams_common/src/java/.../dao/IRatingDAO.java
- -0
- +66
/lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
- History
- Source
/lams_common/src/.../RatingCommentDAO.java
- -16
- +21
/lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
- History
- Source
- Diff
/lams_common/src/.../hibernate/RatingDAO.java
- -0
- +101
/lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingCriteriaDTO.java
- History
- Source
/lams_common/src/.../dto/RatingCriteriaDTO.java
- -81
- +0
/lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingDTO.java
- History
- Source
- Diff
/lams_common/src/java/.../dto/RatingDTO.java
- -0
- +102
/lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java
- History
- Source
/lams_common/src/java/.../model/RatingComment.java
- -0
- +10
/lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
- History
- Source
- Diff
/lams_common/src/.../RatingCriteria.java
… 12 more files in changeset.

8:52 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
c8050d6
changed 1 file
v4.7, v4.8

LDEV-3443: Improve performance by paging - load only 50 'threads' at a time within a topic. The Edit and the Reply are also inlined for the standard interface. LDEV-3455 Rest support for templates, involving portions of a rest based learning design saving interface.

- -828
- +995
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java

8:51 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
2ff38cd
changed 37 files
v4.7, v4.8

LDEV-3443: Improve performance by paging - load only 50 'threads' at a time within a topic. The Edit and the Reply are also inlined for the standard interface.