Activity lams-github/lams_tool

10:41 pm

Marcin Cieslak

More
d2c76e5
changed 64 files
v4.7, v4.8

LDEV-4786 Allow creating learning outcomes on the fly

- -0
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 63 more files in changeset.

3:26 pm

Ernie Ghiglione <ernieg@gmail.com>

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

LDEV-4769 Updating Greek

- -2
- +6
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties

2:54 pm

Ernie Ghiglione <ernieg@gmail.com>

More
e3da1d4
changed 5 files
v4.7, v4.8

LDEV-4739 Updating labels for survey

Updating English, Spanish, Norwegian and Greek

- -9
- +7
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -5
- +2
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -5
- +6
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -3
- +6
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -5
- +2
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties

11:31 pm

Marcin Cieslak

More
d7de6a4
changed 15 files
v4.7, v4.8

LDEV-4696 Rewrite Survey to Hibernate annotations

- -198
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../model/Survey.hbm.xml
- -81
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyAnswer.hbm.xml
- -40
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyCondition.hbm.xml
- -53
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyOption.hbm.xml
- -123
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyQuestion.hbm.xml
- -80
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveySession.hbm.xml
- -108
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyUser.hbm.xml
… 8 more files in changeset.

1:22 pm

Marcin Cieslak

More
62aaf16
changed 649 files
v4.7, v4.8

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

- -1
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 648 more files in changeset.

10:49 pm

Marcin Cieslak

More
b67bc25
changed 119 files
v4.7, v4.8

LDEV-4644 Add outcomes in authoring in all tools

- -1
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 118 more files in changeset.

3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

More
2d20cd7
changed 49 files
v4.7, v4.8

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

- -6
- +4
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 48 more files in changeset.

11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

More
9cd465b
changed 26 files
v4.7, v4.8

LDEV-4054: Updating labels

- -3
- +3
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 25 more files in changeset.

7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

More
70c36dd
changed 39 files
v4.7, v4.8

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

- -12
- +9
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 38 more files in changeset.

11:17 am

Ernie Ghiglione <ernieg@gmail.com>

More
4c51f9c
changed 57 files
v4.7, v4.8

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

- -3
- +3
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +3
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -2
- +2
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -2
- +3
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
… 53 more files in changeset.

9:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
4cc9889
changed 2 files
v4.7, v4.8

LDEV-4499 Answers are timestamped in the export spreadsheet

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 1 more file in changeset.

10:41 pm

Marcin Cieslak

More
b278d62
changed 98 files

LDEV-4411 Add collections 2nd level cache

- -0
- +4
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../model/Survey.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyCondition.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyQuestion.hbm.xml
… 95 more files in changeset.

1:19 am

Marcin Cieslak

More
64b01b1
changed 238 files

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../model/Survey.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyAnswer.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyOption.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyQuestion.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveySession.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyUser.hbm.xml
… 232 more files in changeset.

11:36 am

Ernie Ghiglione <ernieg@gmail.com>

More
271d374
changed 53 files
v4.7, v4.8

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

- -21
- +19
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
… 52 more files in changeset.

1:03 pm

erniegx <ernieg@gmail.com>

More
210742c
changed 19 files
v4.7, v4.8

LDEV-4054: Updating Greek

- -2
- +2
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
… 18 more files in changeset.

8:11 am

erniegx <ernieg@gmail.com>

More
b1e97a1
changed 8 files
v4.7, v4.8

LDEV-4258 adding labels

- -3
- +5
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +3
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
… 6 more files in changeset.

9:02 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
9b72061
changed 4 files
v4.7, v4.8

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 3 more files in changeset.

2:07 pm

Marcin Cieslak

More
8620cb3
changed 142 files
v4.7, v4.8

LDEV-4184: "outer-join" attribute in hbm.xml files is deprecated and produces warnings on server start up. Remove entries with "auto" value. Entries with value "true" become fetch=join.

- -1
- +1
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../model/Survey.hbm.xml
- -2
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyAnswer.hbm.xml
- -1
- +1
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyQuestion.hbm.xml
- -1
- +1
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveySession.hbm.xml
- -2
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml
- History
- Source
- Diff
./hibernate/mappings/.../SurveyUser.hbm.xml
… 137 more files in changeset.

10:34 pm

Marcin Cieslak

More
b036e6d
changed 29 files
v4.7, v4.8

LDEV-4127: Remove default tool conditions. Fix conditions refresh in Authoring.

- -1
- +0
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 28 more files in changeset.

7:43 am

erniegx <ernieg@gmail.com>

More
2e18692
changed 3 files
v4.7, v4.8

LDEV-4054 updating English, Greek

- -22
- +16
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -10
- +8
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -19
- +15
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties

1:40 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
1c9c204
changed 8 files
v4.7, v4.8

LDEV-3867: Grouping options in the advanced tag, updating tags from core.

- -1
- +3
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 7 more files in changeset.

4:10 pm

Marcin Cieslak

More
06f1eda
changed 1005 files

LDEV-3776: Remove $Id CVS keyword.

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -1
- +1
./language/lams/ApplicationResources_ar_JO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_ar_JO.properties
- -1
- +1
./language/lams/ApplicationResources_cy_GB.properties
- History
- Source
- Diff
./language/.../ApplicationResources_cy_GB.properties
- -1
- +1
./language/lams/ApplicationResources_da_DK.properties
- History
- Source
- Diff
./language/.../ApplicationResources_da_DK.properties
- -1
- +1
./language/lams/ApplicationResources_de_DE.properties
- History
- Source
- Diff
./language/.../ApplicationResources_de_DE.properties
- -1
- +1
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -1
- +1
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -1
- +1
./language/lams/ApplicationResources_es_MX.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_MX.properties
- -1
- +1
./language/lams/ApplicationResources_fr_FR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_fr_FR.properties
- -1
- +1
./language/lams/ApplicationResources_it_IT.properties
- History
- Source
- Diff
./language/.../ApplicationResources_it_IT.properties
- -1
- +1
./language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
./language/.../ApplicationResources_ja_JP.properties
- -1
- +1
./language/lams/ApplicationResources_ko_KR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_ko_KR.properties
- -1
- +1
./language/lams/ApplicationResources_lt_LT.properties
- History
- Source
- Diff
./language/.../ApplicationResources_lt_LT.properties
- -1
- +1
./language/lams/ApplicationResources_mi_NZ.properties
- History
- Source
- Diff
./language/.../ApplicationResources_mi_NZ.properties
… 990 more files in changeset.

3:38 pm

Marcin Cieslak

More
2f725f8
changed 1280 files
v4.7, v4.8

LDEV-3776: Remove $Id CVS keyword.

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -1
- +1
./language/lams/ApplicationResources_ar_JO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_ar_JO.properties
- -1
- +1
./language/lams/ApplicationResources_cy_GB.properties
- History
- Source
- Diff
./language/.../ApplicationResources_cy_GB.properties
- -1
- +1
./language/lams/ApplicationResources_da_DK.properties
- History
- Source
- Diff
./language/.../ApplicationResources_da_DK.properties
- -1
- +1
./language/lams/ApplicationResources_de_DE.properties
- History
- Source
- Diff
./language/.../ApplicationResources_de_DE.properties
- -1
- +1
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -1
- +1
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -1
- +1
./language/lams/ApplicationResources_es_MX.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_MX.properties
- -1
- +1
./language/lams/ApplicationResources_fr_FR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_fr_FR.properties
- -1
- +1
./language/lams/ApplicationResources_it_IT.properties
- History
- Source
- Diff
./language/.../ApplicationResources_it_IT.properties
- -1
- +1
./language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
./language/.../ApplicationResources_ja_JP.properties
- -1
- +1
./language/lams/ApplicationResources_ko_KR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_ko_KR.properties
- -1
- +1
./language/lams/ApplicationResources_lt_LT.properties
- History
- Source
- Diff
./language/.../ApplicationResources_lt_LT.properties
- -1
- +1
./language/lams/ApplicationResources_mi_NZ.properties
- History
- Source
- Diff
./language/.../ApplicationResources_mi_NZ.properties
… 1265 more files in changeset.

9:23 pm

Marcin Cieslak

More
65efb0a
changed 404 files
v4.7, v4.8

LDEV-3768: Remove XDoclet library and corresponding Ant tasks. Generate and use static configuration files instead.

- -0
- +198
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
- History
- Source
./hibernate/mappings/org/.../model/Survey.hbm.xml
- -0
- +81
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
- History
- Source
./hibernate/mappings/.../model/SurveyAnswer.hbm.xml
- -0
- +53
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml
- History
- Source
./hibernate/mappings/.../model/SurveyOption.hbm.xml
- -0
- +123
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
- History
- Source
./hibernate/mappings/.../SurveyQuestion.hbm.xml
- -0
- +80
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml
- History
- Source
./hibernate/mappings/.../SurveySession.hbm.xml
- -0
- +108
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml
- History
- Source
./hibernate/mappings/.../model/SurveyUser.hbm.xml
- -8
- +0
./xdoclet/global-exceptions.xml
- History
- Source
- Diff
./xdoclet/global-exceptions.xml
- -6
- +0
./xdoclet/global-forwards.xml
- History
- Source
- Diff
./xdoclet/global-forwards.xml
- -292
- +0
./xdoclet/struts-actions.xml
- History
- Source
- Diff
./xdoclet/struts-actions.xml
- -1
- +0
./xdoclet/struts-forms.xml
- History
- Source
- Diff
./xdoclet/struts-forms.xml
- -1
- +0
./xdoclet/struts-message-resources.xml
- History
- Source
- Diff
./xdoclet/struts-message-resources.xml
- -1
- +0
./xdoclet/struts-plugins.xml
- History
- Source
- Diff
./xdoclet/struts-plugins.xml
- -29
- +0
./xdoclet/validation-forms.xml
- History
- Source
- Diff
./xdoclet/validation-forms.xml
- -6
- +0
./xdoclet/validation-global.xml
- History
- Source
- Diff
./xdoclet/validation-global.xml
… 390 more files in changeset.

3:36 pm

erniegx <ernieg@gmail.com>

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

LDEV-3709: adding label

- -3
- +5
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -3
- +4
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -3
- +4
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties

8:36 pm

Marcin Cieslak

More
5e63656
changed 372 files
v4.7, v4.8

LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

- -1
- +0
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 371 more files in changeset.

11:15 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
0012f4c
changed 18 files
v4.7, v4.8

LDEV-3585: Survey monitor UI to support paging, sort and search for answers.

- -4
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +7
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -3
- +3
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -2
- +3
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -2
- +7
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
- -3
- +11
./xdoclet/struts-actions.xml
- History
- Source
- Diff
./xdoclet/struts-actions.xml
… 12 more files in changeset.

11:41 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
6a41362
changed 11 files

LDEV-3585: Survey monitor - Reflections are now paged.

- -3
- +2
./xdoclet/struts-actions.xml
- History
- Source
- Diff
./xdoclet/struts-actions.xml
… 10 more files in changeset.

7:37 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
b7ba7cc
changed 14 files

LDEV-3585: Survey monitor UI to support paging, sort and search for answers

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -0
- +9
./xdoclet/struts-actions.xml
- History
- Source
- Diff
./xdoclet/struts-actions.xml
… 12 more files in changeset.

8:03 pm

Marcin Cieslak

More
329ca3f
changed 4 files
v4.7, v4.8

LDEV-3452: Save Conditions along with Questions (cascade) when creating a lesson and importing a LD.

- -1
- +1
./hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml
- History
- Source
- Diff
./hibernate/.../SurveyCondition.hbm.xml
… 3 more files in changeset.

conf

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Marcin Cieslak

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

erniegx <ernieg@gmail.com>

erniegx <ernieg@gmail.com>

FionaMalikoff <Fiona.Malikoff@gmail.com>

Marcin Cieslak

Marcin Cieslak

erniegx <ernieg@gmail.com>

FionaMalikoff <Fiona.Malikoff@gmail.com>

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

erniegx <ernieg@gmail.com>

Marcin Cieslak

FionaMalikoff <Fiona.Malikoff@gmail.com>

FionaMalikoff <Fiona.Malikoff@gmail.com>

FionaMalikoff <Fiona.Malikoff@gmail.com>

Marcin Cieslak