Fisheye on lams-github/lams_tool_gmap/web/pages

lams-github (v4.7): LDEV-4440 Replace BBB and GMap tools with stubs

Andrey Balan — Fri, 21 Sep 2018 19:11:12 +0200

Andrey Balan committed 910f7a3 on branch v4.7, v4.8 in lams-github

LDEV-4440 Replace BBB and GMap tools with stubs

· /lams_tool_bbb/.gitignore

(-1, +0)

| History

| Source

| Diff

· /lams_tool_bbb/.mymetadata

(-13, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml

(-153, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbConfig.hbm.xml

(-53, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml

(-137, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbUser.hbm.xml

(-103, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources.properties

(-73, +1)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_el_GR.properties

(-75, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_en_AU.properties

(-75, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_es_ES.properties

(-75, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_es_MX.properties

(-84, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_fr_FR.properties

(-84, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_mi_NZ.properties

(-84, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_no_NO.properties

(-75, +0)

| History

| Source

| Diff

· /lams_tool_bbb/conf/language/lams/ApplicationResources_pt_BR.properties

(-74, +0)

| History

| Source

| Diff

… 293 more files in changeset.

lams-github (v4.7): Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration...

Marcin Cieslak — Sat, 15 Sep 2018 07:22:02 +0200

Marcin Cieslak committed 62aaf16 on branch v4.7, v4.8 in lams-github

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

· /3rdParty_sources/versions.txt

(-0, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-2, +54)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

(-2, +47)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +48)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

(-7, +53)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml

(-1, +4)

| History

| Source

| Diff

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

(-51, +38)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java

(-8, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java

(-4, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java

(-43, +7)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

(-12, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java

(-0, +264)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

(-2, +7)

| History

| Source

| Diff

… 634 more files in changeset.

lams-github (v4.7): LDEV-4644 Add outcomes in authoring in all tools

Marcin Cieslak — Thu, 16 Aug 2018 16:49:22 +0200

Marcin Cieslak committed b67bc25 on branch v4.7, v4.8 in lams-github

LDEV-4644 Add outcomes in authoring in all tools

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-1, +4)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

(-0, +155)

| History

| Source

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-0, +4)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

(-0, +155)

| History

| Source

· /lams_central/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_gradebook/conf/language/lams/ApplicationResources.properties

(-1, +4)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

(-0, +155)

| History

| Source

· /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_learning/conf/language/lams/ApplicationResources.properties

(-1, +4)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

(-0, +155)

| History

| Source

· /lams_learning/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_monitoring/conf/language/lams/ApplicationResources.properties

(-0, +4)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

(-0, +155)

| History

| Source

· /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

… 104 more files in changeset.

lams-github (v4.7): Monthly merge from master to lams31...

Marcin Cieslak — Fri, 23 Mar 2018 19:12:13 +0100

Marcin Cieslak committed ad8707a on branch v4.7, v4.8 in lams-github

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

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

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

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

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

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

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

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

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

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

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

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

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

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

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java

(-5, +46)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java

(-0, +216)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java

(-3, +3)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

(-0, +292)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

(-9, +9)

| History

| Source

| Diff

· /lams_build/conf/domain.xml

(-21, +0)

| History

| Source

| Diff

· /lams_build/conf/slim/standalone.xml

(-23, +0)

| History

| Source

| Diff

· /lams_build/conf/standalone.xml

(-23, +0)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

(-29, +17)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

(-7, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/AssessMCAnswer.java

(-0, +119)

| History

| Source

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/PeerReviewCriteria.java

(-0, +103)

| History

| Source

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/SurveyQuestion.java

(-0, +103)

| History

| Source

… 69 more files in changeset.

lams-github (v4.7): LDEV-3805 Reflections are paged.

Mon, 08 Jan 2018 12:42:59 +0100

Fiona Malikoff committed 5784065 on branch v4.7, v4.8 in lams-github

LDEV-3805 Reflections are paged.

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(-5, +46)	\| History	\| Source	\| Diff
· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(-2, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java	(-1, +103)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(-0, +24)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(-38, +51)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-1, +13)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/notebook.jsp	(-30, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-100, +96)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4417 Popover portraits in Monitoring...

Thu, 14 Sep 2017 11:22:51 +0200

Fiona Malikoff committed 5e2c434 on branch v4.7, v4.8 in lams-github

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-3, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

Andrey Balan — Fri, 07 Apr 2017 16:26:06 +0200

Andrey Balan committed 58448aa on branch v4.7, v4.8 in lams-github

LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

· /lams_tool_bbb/web/pages/monitoring/editActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/monitoring/editActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/monitoring/editactivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/monitoring/editactivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/learning/gmap.jsp

(-15, +12)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/monitoring/editActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/web/pages/monitoring/editactivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_imscc/web/pages/monitoring/editactivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_kaltura/web/pages/monitoring/editActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_lamc/web/monitoring/Edit.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/Edit.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/monitoring/editactivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_leader/web/pages/monitoring/editActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/monitoring/editActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java

(-12, +3)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-4286 Show Authoring advanced tab on re-editing content from monitor

Andrey Balan — Wed, 05 Apr 2017 18:32:02 +0200

Andrey Balan committed 6cfcb91 on branch v4.7, v4.8 in lams-github

LDEV-4286 Show Authoring advanced tab on re-editing content from monitor

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

(-10, +6)

| History

| Source

| Diff

· /lams_tool_bbb/web/pages/authoring/authoring.jsp

(-19, +10)

| History

| Source

| Diff

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

(-27, +16)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/authoring/authoring.jsp

(-14, +5)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/monitoring/monitoring.jsp

(-14, +14)

| History

| Source

| Diff

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

(-29, +21)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/authoring/authoring.jsp

(-13, +3)

| History

| Source

| Diff

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

(-12, +9)

| History

| Source

| Diff

· /lams_tool_kaltura/web/pages/authoring/authoring.jsp

(-11, +3)

| History

| Source

| Diff

· /lams_tool_leader/web/pages/authoring/authoring.jsp

(-6, +1)

| History

| Source

| Diff

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

(-11, +8)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/authoring/authoring.jsp

(-11, +3)

| History

| Source

| Diff

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

(-10, +6)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/authoring/authoring.jsp

(-8, +4)

| History

| Source

| Diff

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

(-9, +6)

| History

| Source

| Diff

… 7 more files in changeset.

lams-github (): LDEV-4067: changing google maps URL to be on https rather than http

Sun, 20 Nov 2016 15:44:38 +0100

erniegx committed d94d8be on branch in lams-github

LDEV-4067: changing google maps URL to be on https rather than http

· /lams_tool_gmap/web/common/learnerheader.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4067: changing google maps URL to be on https rather than http

Sun, 20 Nov 2016 15:43:07 +0100

erniegx committed 0e32384 on branch v4.7, v4.8 in lams-github

LDEV-4067: changing google maps URL to be on https rather than http

· /lams_tool_gmap/web/common/learnerheader.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/headItems.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3436: Refactoring Save/Finish button code

Fri, 16 Sep 2016 03:50:38 +0200

SanjanaPabsetti committed 3929244 on branch v4.7, v4.8 in lams-github

LDEV-3436: Refactoring Save/Finish button code

· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp

(-4, +0)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3436: Consistent Save/Finish Buttons Gmap tool

Fri, 16 Sep 2016 03:48:49 +0200

SanjanaPabsetti committed 356e0f1 on branch v4.7, v4.8 in lams-github

LDEV-3436: Consistent Save/Finish Buttons Gmap tool

· /lams_tool_gmap/web/pages/learning/gmap.jsp

(-4, +13)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3923: Updating gmap learner screens to suit sliding div based progress bar.

Mon, 01 Aug 2016 05:23:18 +0200

FionaMalikoff committed 90a0e87 on branch v4.7, v4.8 in lams-github

LDEV-3923: Updating gmap learner screens to suit sliding div based progress bar.

· /lams_tool_gmap/web/layouts/learningLayout.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/notebook.jsp	(-0, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3850: Grouping options in the advanced tag, updating tags from core.

Wed, 29 Jun 2016 14:21:03 +0200

FionaMalikoff committed 7e36808 on branch v4.7, v4.8 in lams-github

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

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/Arrow.tag	(-2, +22)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(-0, +349)	\| History	\| Source
· /lams_tool_gmap/web/WEB-INF/tags/Date.tag	(-0, +9)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/Page.tag	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/Rating.tag	(-0, +194)	\| History	\| Source
· /lams_tool_gmap/web/WEB-INF/tags/SimplePanel.tag	(-0, +32)	\| History	\| Source
· /lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(-1, +13)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/advanced.jsp	(-11, +16)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3826: Bootstrapping Admin

Tue, 14 Jun 2016 04:23:30 +0200

FionaMalikoff committed cc63e2e on branch v4.7, v4.8 in lams-github

LDEV-3826: Bootstrapping Admin

· /lams_tool_gmap/web/pages/admin/config.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_images/web/pages/admin/config.jsp	(-17, +12)	\| History	\| Source	\| Diff
· /lams_tool_imscc/web/pages/admin/config.jsp	(-16, +11)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3798: Update GMap Admin screen to Bootstrap

Fri, 13 May 2016 04:55:48 +0200

FionaMalikoff committed 98cc686 on branch v4.7, v4.8 in lams-github

LDEV-3798: Update GMap Admin screen to Bootstrap

· /lams_tool_gmap/web/pages/admin/config.jsp

(-25, +16)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3793: Bootstrapping monitor

Fri, 13 May 2016 04:39:11 +0200

FionaMalikoff committed 0006e57 on branch v4.7, v4.8 in lams-github

LDEV-3793: Bootstrapping monitor

· /lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/advancedOptions.jsp	(-0, +167)	\| History	\| Source
· /lams_tool_gmap/web/pages/monitoring/editActivity.jsp	(-13, +11)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/monitoring.jsp	(-15, +14)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/notebook.jsp	(-32, +6)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/statistics.jsp	(-28, +36)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-273, +142)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3792: Bootstrapping GMap Author

Thu, 12 May 2016 04:48:44 +0200

FionaMalikoff committed 5b49576 on branch v4.7, v4.8 in lams-github

LDEV-3792: Bootstrapping GMap Author

· /lams_tool_gmap/web/WEB-INF/tags/AdvancedAccordian.tag

(-0, +53)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/Arrow.tag

(-0, +35)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag

(-6, +6)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag

(-4, +12)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Comments.tag

(-0, +47)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/CommentsAuthor.tag

(-0, +51)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/ImgButtonWrapper.tag

(-37, +37)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Page.tag

(-7, +20)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-0, +54)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/TSTable.tag

(-0, +53)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/Tab.tag

(-12, +16)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/TabBody.tag

(-14, +6)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/TabBodyArea.tag

(-0, +39)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/TabBodys.tag

(-0, +37)

| History

| Source

· /lams_tool_gmap/web/WEB-INF/tags/Tabs.tag

(-32, +55)

| History

| Source

| Diff

… 9 more files in changeset.

lams-github (v4.7): LDEV-3699: Tweaking formatting

Sun, 06 Mar 2016 05:48:17 +0100

FionaMalikoff committed 0f5ab99 on branch v4.7, v4.8 in lams-github

LDEV-3699: Tweaking formatting

· /lams_tool_gmap/web/pages/learning/notebook.jsp

(-14, +19)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3699: Tweaking formatting

Sun, 06 Mar 2016 03:22:51 +0100

FionaMalikoff committed f7be1a7 on branch v4.7, v4.8 in lams-github

LDEV-3699: Tweaking formatting

· /lams_tool_gmap/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3699: Tweaking formatting

Sun, 06 Mar 2016 03:09:04 +0100

FionaMalikoff committed c15a9de on branch v4.7, v4.8 in lams-github

LDEV-3699: Tweaking formatting

· /lams_tool_gmap/web/pages/learning/notebook.jsp

(-2, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3699: Tweaking formatting

Sun, 06 Mar 2016 03:06:54 +0100

FionaMalikoff committed c754368 on branch v4.7, v4.8 in lams-github

LDEV-3699: Tweaking formatting

· /lams_tool_gmap/web/WEB-INF/tags/Page.tag	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/notebook.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3699: Update Gmap Learner to Bootstrap

Mon, 29 Feb 2016 04:23:27 +0100

FionaMalikoff committed b448760 on branch v4.7, v4.8 in lams-github

LDEV-3699: Update Gmap Learner to Bootstrap

· /lams_tool_gmap/web/pages/learning/gmap.jsp

(-2, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3699: Update Gmap Learner to Bootstrap

Mon, 29 Feb 2016 04:11:42 +0100

FionaMalikoff committed e4a3e68 on branch v4.7, v4.8 in lams-github

LDEV-3699: Update Gmap Learner to Bootstrap

· /lams_tool_gmap/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source
· /lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(-7, +15)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/WEB-INF/tags/Page.tag	(-0, +36)	\| History	\| Source
· /lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(-1, +9)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/common/mapLegend.jsp	(-0, +29)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/defineLater.jsp	(-7, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-37, +35)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/notebook.jsp	(-9, +3)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(-35, +38)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2...

Marcin Cieslak — Fri, 26 Feb 2016 08:17:56 +0100

Marcin Cieslak committed e48fc0e on branch v4.7, v4.8 in lams-github

LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

· /lams_admin/web/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/admin.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/authoringConfirm.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/development/wddxPost.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/editLessonIntro.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/403.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/404.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/findUserLessons.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/index.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/lamscommunity/lamscommunityLogin.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/lessonIntro.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/sysadmin.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_gradebook/web/error.jsp

(-2, +1)

| History

| Source

| Diff

… 326 more files in changeset.

lams-github (v4.7): LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute fr...

Marcin Cieslak — Wed, 24 Feb 2016 13:36:24 +0100

Marcin Cieslak committed 5e63656 on branch v4.7, v4.8 in lams-github

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.

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-2, +0)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/struts-forms.xml

(-1, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-8, +0)

| History

| Source

| Diff

· /lams_admin/web/organisation/createOrEdit.jsp

(-10, +0)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-monitoring.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-2, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java

(-1, +0)

| History

| Source

| Diff

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

(-27, +26)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java

(-2, +0)

| History

| Source

| Diff

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

(-59, +49)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-9, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java

(-31, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java

(-20, +17)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-85, +85)

| History

| Source

| Diff

… 357 more files in changeset.

lams-github (v4.7): LDEV-2917: Use <!DOCTYPE html> everywhere.

Marcin Cieslak — Tue, 09 Feb 2016 19:53:33 +0100

Marcin Cieslak committed 2ef18e4 on branch v4.7, v4.8 in lams-github

LDEV-2917: Use everywhere.

· /TestHarness4LAMS2/template.html

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/openidConfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/template.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/timezoneServerManagement.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/learningLibraryGroup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmactualfolder.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmcreatefolder.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmresourcetype.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmupload.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/comments/comments.jsp

(-1, +1)

| History

| Source

| Diff

… 156 more files in changeset.

lams-github (v4.7): LDEV-3211: Fix reflections formatting in learner

Tue, 08 Apr 2014 00:21:53 +0200

erniegx committed b88cfca on branch v4.7, v4.8 in lams-github

LDEV-3211: Fix reflections formatting in learner

· /lams_tool_assessment/web/pages/learning/learning.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/conf/language/ApplicationResources.properties	(-103, +0)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/results.jsp	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_spreadsheet/web/pages/learning/learning.jsp	(-3, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-2463: escape HTML to prevent possible XSS attacks

Thu, 27 Mar 2014 19:22:21 +0100

erniegx committed d9fea0d on branch v4.7, v4.8 in lams-github

LDEV-2463: escape HTML to prevent possible XSS attacks

· /lams_tool_gmap/web/common/learnerheader.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/authoring/basic.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(-12, +11)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/gmap.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/notebook.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/editActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/notebook.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_gmap/web/pages/monitoring/summary.jsp	(-4, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

Andrey Balan — Fri, 17 Jan 2014 22:45:04 +0100

Andrey Balan committed 6d674e3 on branch v4.7, v4.8 in lams-github

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

· /lams_tool_daco/conf/xdoclet/struts-actions.xml

(-18, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java

(-12, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml

(-5, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20140102.sql

(-0, +19)

| History

| Source

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java

(-127, +3)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAttachment.java

(-166, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/.../tool/daco/service/DacoImportContentVersionFilter.java

(-0, +43)

| History

| Source

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

(-63, +9)

| History

| Source

| Diff

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

(-19, +0)

| History

| Source

| Diff

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

(-245, +1)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/DacoForm.java

(-1, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/servlet/ExportServlet.java

(-25, +0)

| History

| Source

| Diff

… 120 more files in changeset.