Activity lams-github/

7:01 pm

Andrey Balan

More
8e8aeae
added 17 files
v4.7, v4.8

LDEV-2657 Date and time restriction in activities

*merge from lams2_3_release

- -0
- +386
/lams_central/web/css/jquery-ui-1.8.11.flick-theme.css
- History
- Source
/lams_central/.../jquery-ui-1.8.11.flick-theme.css
- -0
- +6
/lams_central/web/css/jquery-ui-timepicker-addon.css
- History
- Source
/lams_central/.../jquery-ui-timepicker-addon.css
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_flat_0_aaaaaa_40x100.png
- History
- Source
/lams_central/.../ui-bg_flat_0_aaaaaa_40x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_flat_0_eeeeee_40x100.png
- History
- Source
/lams_central/.../ui-bg_flat_0_eeeeee_40x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_flat_55_ffffff_40x100.png
- History
- Source
/lams_central/.../ui-bg_flat_55_ffffff_40x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_flat_75_ffffff_40x100.png
- History
- Source
/lams_central/.../ui-bg_flat_75_ffffff_40x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_glass_65_ffffff_1x400.png
- History
- Source
/lams_central/.../ui-bg_glass_65_ffffff_1x400.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_highlight-soft_100_f6f6f6_1x100.png
- History
- Source
/lams_central/.../ui-bg_highlight-soft_100_f6f6f6_1x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_highlight-soft_25_0073ea_1x100.png
- History
- Source
/lams_central/.../ui-bg_highlight-soft_25_0073ea_1x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-bg_highlight-soft_50_dddddd_1x100.png
- History
- Source
/lams_central/.../ui-bg_highlight-soft_50_dddddd_1x100.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-icons_0073ea_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_0073ea_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-icons_454545_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_454545_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-icons_666666_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_666666_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-icons_ff0084_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_ff0084_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.flick-theme/ui-icons_ffffff_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_ffffff_256x240.png
- -0
- +16
/lams_central/web/includes/javascript/jquery-1.5.1.min.js
- History
- Source
/lams_central/web/.../jquery-1.5.1.min.js
- -0
- +911
/lams_central/web/includes/javascript/jquery-ui-timepicker-addon.js
- History
- Source
/lams_central/.../jquery-ui-timepicker-addon.js

8:36 pm

Andrey Balan

More
b0e43d3
changed 23 files
v4.7, v4.8

LDEV-2665 Ability to upload user's portrait directly from the webcam

*merge from lams2_3_release

- -12
- +70
/lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
- History
- Source
- Diff
/lams_central/src/.../PortraitSaveAction.java
- -0
- +405
/lams_central/web/css/jquery-ui-1.8.11.redmont-theme.css
- History
- Source
/lams_central/.../jquery-ui-1.8.11.redmont-theme.css
- binary
/lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_flat_0_aaaaaa_40x100.png
- History
- Source
/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
/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
/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
/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
/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
/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
/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
/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
/lams_central/web/.../ui-icons_217bc0_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_2e83ff_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_2e83ff_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_469bdd_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_469bdd_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_6da8d5_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_6da8d5_256x240.png
- binary
/lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_cd0a0a_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_cd0a0a_256x240.png
… 8 more files in changeset.

12:25 am

LDEV-2646: Several fixes for Planner access control: "Viewing" and "removing" is for whole nodes, not just templates. Node's owner can not remove it if there are subnodes he doesn't have permissions to remove.

- -24
- +62
/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
/lams_central/.../PedagogicalPlannerAction.java
- -7
- +7
/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
- History
- Source
- Diff
/lams_central/.../PedagogicalPlannerSequenceNodeForm.java
- -3
- +3
/lams_central/web/includes/javascript/pedagogicalPlanner.js
- History
- Source
- Diff
/lams_central/web/.../pedagogicalPlanner.js
- -0
- +5
/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
- History
- Source
- Diff
/lams_common/src/.../patch02040006.sql
- -11
- +12
/lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
- History
- Source
- Diff
/lams_common/.../PedagogicalPlannerSequenceNodeDTO.java

12:31 pm

erniegx <ernieg@gmail.com>

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

LDEV-2666: issues with jqgrid and firefox 4

- -5
- +1
/lams_central/web/includes/javascript/jqgrid/js/jquery.jqGrid.js
- History
- Source
- Diff
/lams_central/web/.../js/jquery.jqGrid.js

12:28 pm

erniegx <ernieg@gmail.com>

More
0405e49
changed 1 file
v4.7, v4.8

LDEV-2464: increase size ckeditor

- -1
- +1
/lams_tool_nb/web/authoring/basic.jsp
- History
- Source
- Diff
/lams_tool_nb/web/authoring/basic.jsp

5:16 am

Andrey Balan

More
a91a7f5
changed 9 files
v4.7, v4.8

LDEV-2664 Switch learner interface for learners if they use a mobile device

*merge from lams2_3_release

- -0
- +1
/lams_central/build.xml
- History
- Source
- Diff
/lams_central/build.xml
- -0
- +6
/lams_central/conf/xdoclet/filter-mappings.xml
- History
- Source
- Diff
/lams_central/conf/.../filter-mappings.xml
- -0
- +5
/lams_central/conf/xdoclet/filters.xml
- History
- Source
- Diff
/lams_central/conf/xdoclet/filters.xml
- binary
/lams_central/web/WEB-INF/lib/urlrewrite-3.2.0.jar
- History
- Source
/lams_central/web/.../lib/urlrewrite-3.2.0.jar
- -0
- +84
/lams_central/web/WEB-INF/urlrewrite.xml
- History
- Source
/lams_central/web/WEB-INF/urlrewrite.xml
- -1
- +2
/lams_central/web/learner.jsp
- History
- Source
- Diff
/lams_central/web/learner.jsp
- -0
- +3
/lams_common/db/sql/insert_lams_unix_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_unix_config_data.sql
- -0
- +3
/lams_common/db/sql/insert_lams_windows_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_windows_config_data.sql
- -0
- +5
/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
- History
- Source
- Diff
/lams_common/src/.../patch02040006.sql

1:56 am

Andrey Balan

More
901372a
changed 11 files
v4.7, v4.8

LDEV-2662 improving forum performance

*merge from lams2_3_release

- -9
- +0
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
- History
- Source
- Diff
/lams_tool_forum/src/.../dto/MessageDTO.java
- -6
- +0
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReportDAO.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumReportDAO.java
- -31
- +31
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
- History
- Source
- Diff
/lams_tool_forum/src/.../Message.java
- -106
- +101
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
- History
- Source
- Diff
/lams_tool_forum/src/.../MessageDao.java
- -5
- +26
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java
- History
- Source
- Diff
/lams_tool_forum/src/.../MessageSeqDao.java
- -40
- +4
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/TimestampDao.java
- History
- Source
- Diff
/lams_tool_forum/src/.../TimestampDao.java
- -67
- +50
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -25
- +8
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../IForumService.java
- -64
- +18
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -1
- +1
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_forum/.../MonitoringAction.java
- -1
- +1
/lams_tool_forum/web/jsps/learning/message/topiclist.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiclist.jsp

12:51 am

Andrey Balan

More
501ddb6
changed 37 files
v4.7, v4.8

LDEV-2660 rolled back QaQuestion.java --> QaQueContent.java

*merge from lams2_3_release

- -1
- +1
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../QaCondition.hbm.xml
- -2
- +2
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaContent.hbm.xml
- -1
- +1
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQuestion.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../QaQuestion.hbm.xml
- -1
- +1
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaUsrResp.hbm.xml
- -14
- +14
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaCondition.java
- -12
- +12
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaContent.java
- -0
- +228
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaQueContent.java
- -228
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestion.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaQuestion.java
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaUploadedFile.java
- -6
- +6
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaUsrResp.java
- -6
- +6
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../IQaQuestionDAO.java
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaContentDAO.java
- -1
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaQueUsrDAO.java
- -13
- +13
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaQuestionDAO.java
- -6
- +6
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaConditionDTO.java
… 22 more files in changeset.

3:28 am

Andrey Balan

More
6578a27
changed 6 files
v4.7, v4.8

LDEV-2654 preserve all Advanced Settings in monitor

*merge from lams2_3_release

- -0
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAppConstants.java
- -9
- +7
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../ExportServlet.java
- -7
- +11
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../MonitoringUtil.java
- -80
- +27
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaMonitoringAction.java
- -24
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaMonitoringStarterAction.java
- -32
- +58
/lams_tool_laqa/web/monitoring/SummaryContent.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../SummaryContent.jsp

1:14 am

Andrey Balan

More
91f0740
changed 121 files
v4.7, v4.8

LDEV-2653 autosave feature

*merge from lams2_3_release

- -1
- +1
/lams_tool_laqa/.classpath
- History
- Source
- Diff
/lams_tool_laqa/.classpath
- -1
- +1
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../QaCondition.hbm.xml
- -2
- +2
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaContent.hbm.xml
- -100
- +0
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../QaQueContent.hbm.xml
- -9
- +0
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaQueUsr.hbm.xml
- -0
- +70
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQuestion.hbm.xml
- History
- Source
/lams_tool_laqa/conf/.../qa/QaQuestion.hbm.xml
- -11
- +0
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaSession.hbm.xml
- -31
- +2
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaUsrResp.hbm.xml
- -1
- +0
/lams_tool_laqa/db/sql/create_lams_tool_qa.sql
- History
- Source
- Diff
/lams_tool_laqa/.../create_lams_tool_qa.sql
- -67
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/EditActivityDTO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../EditActivityDTO.java
- -714
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../GeneralLearnerFlowDTO.java
- -292
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../GeneralMonitoringDTO.java
- -104
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAllGroupsDTO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAllGroupsDTO.java
- -74
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaApplicationException.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaApplicationException.java
- -60
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaComparator.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaComparator.java
… 106 more files in changeset.

11:31 pm

Andrey Balan

More
010304d
changed 3 files
v4.7, v4.8

LDEV-2656 Display star rating in export portfolio

*merge from lams2_3_release

- -0
- +123
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumBundler.java
- History
- Source
/lams_tool_forum/src/.../util/ForumBundler.java
- -0
- +12
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ExportServlet.java
- -0
- +25
/lams_tool_forum/web/jsps/export/exportportfolio.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../exportportfolio.jsp

6:33 am

Andrey Balan

More
30e23e6
changed 3 files
v4.7, v4.8

LDEV-2656 Display star rating in export portfolio

*merge from lams2_3_release

- -0
- +124
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaBundler.java
- History
- Source
/lams_tool_laqa/src/java/.../util/QaBundler.java
- -0
- +10
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../ExportServlet.java
- -0
- +21
/lams_tool_laqa/web/export/exportportfolio.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../exportportfolio.jsp

5:56 pm

Marcin Cieslak

More
e2e2aa6
changed 12 files
v4.7, v4.8

LDEV-2642, LDEV-2646: Extend access control for Planner nodes. Add a node's owner field. Fix exporting/importing nodes. Upgrade XStream from 1.1 to 1.1.3.