Fisheye on lams-github/lams_common/conf/hibernate/mappings https://code.lamsfoundation.org/fisheye/changelog/lams-github/lams_common/conf/hibernate/mappings Recent activity in "lams-github" under directory /lams_common/conf/hibernate/mappings lams-github (v4.7): LDEV-4696 Remove hbm.xml file remains Fri, 09 Nov 2018 11:37:50 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=3c3ff3f2bd9e05d38823db2f4932217953acf160 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=3c3ff3f2bd9e05d38823db2f4932217953acf160 Marcin Cieslak committed 3c3ff3f on branch v4.7, v4.8 in lams-github LDEV-4696 Remove hbm.xml file remains

· /lams_common/.classpath (-1, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml (-76, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-6, +0) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy Tue, 06 Nov 2018 11:50:14 +0100 Fiona Malikoff <Fiona.Malikoff@gmail.com> https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=96068ffc66514c1d25e9adeb96acfa164ab29dd5 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=96068ffc66514c1d25e9adeb96acfa164ab29dd5 Fiona Malikoff <Fiona.Malikoff@gmail.com> committed 96068ff on branch v4.7, v4.8 in lams-github LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml (-167, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml (-51, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml (-58, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml (-77, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml (-85, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingCriteria.hbm.xml (-92, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java (-0, +50) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java (-0, +21) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/CommentSession.java (-0, +20) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java (-30, +30) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java (-1, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java (-9, +9) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (-8, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java (-5, +6) | History | Source | Diff
… 20 more files in changeset.
]]> lams-github (v4.7): LDEV-4696 Rewrite part of Common entities to Hibernate annotations Tue, 06 Nov 2018 09:03:11 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=5b1fbc89c883857eace8c043a594a79cb0f60bc4 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=5b1fbc89c883857eace8c043a594a79cb0f60bc4 Marcin Cieslak committed 5b1fbc8 on branch v4.7, v4.8 in lams-github LDEV-4696 Rewrite part of Common entities to Hibernate annotations

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/EmailNotificationArchive.hbm.xml (-63, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml (-115, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml (-74, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml (-86, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml (-67, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml (-223, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml (-63, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml (-82, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/Outcome.hbm.xml (-46, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeMapping.hbm.xml (-25, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeResult.hbm.xml (-39, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScale.hbm.xml (-48, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScaleItem.hbm.xml (-24, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/events/EmailNotificationArchive.java (-1, +30) | History | Source | Diff
… 12 more files in changeset.
]]> lams-github (v4.7): LDEV-4696 Rewrite part of Common entities to Hibernate annotations Mon, 05 Nov 2018 08:57:55 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 Marcin Cieslak committed aaa9a8f on branch v4.7, v4.8 in lams-github LDEV-4696 Rewrite part of Common entities to Hibernate annotations

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-8, +7) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml (-44, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml (-0, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml (-70, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml (-63, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml (-20, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml (-20, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lams/learningdesign/LearningDesignAnnotation.hbm.xml (-32, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml (-80, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml (-66, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml (-21, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml (-206, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml (-78, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml (-105, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lams/usermanagement/AuthenticationMethodType.hbm.xml (-88, +0) | History | Source | Diff
… 40 more files in changeset.
]]> lams-github (v4.7): LDEV-4696 Remove obsolete DTO Sun, 04 Nov 2018 10:48:13 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=f95c86fefb27fbad60e46af80e1a487bae53561a https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=f95c86fefb27fbad60e46af80e1a487bae53561a Marcin Cieslak committed f95c86f on branch v4.7, v4.8 in lams-github LDEV-4696 Remove obsolete DTO

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (-2, +2) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java (-2, +3) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml (-188, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (-479, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (-81, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (-8, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (-17, +20) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (-20, +12) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java (-4, +4) | History | Source | Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (-17, +20) | History | Source | Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (-4, +5) | History | Source | Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (-4, +4) | History | Source | Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (-3, +3) | History | Source | Diff
· /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (-5, +5) | History | Source | Diff
· /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (-3, +3) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4696 Rewrite part of Common entities to Hibernate annotations Sun, 04 Nov 2018 10:41:59 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=cbe532f585efe39250986f20d58cbef855115cf3 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=cbe532f585efe39250986f20d58cbef855115cf3 Marcin Cieslak committed cbe532f on branch v4.7, v4.8 in lams-github LDEV-4696 Rewrite part of Common entities to Hibernate annotations

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml (-84, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml (-97, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml (-80, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml (-22, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lams/lesson/CompletedActivityProgressArchive.hbm.xml (-22, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml (-85, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml (-68, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml (-84, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml (-84, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (-382, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (-401, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java (-43, +17) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (-28, +30) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java (-20, +26) | History | Source | Diff
… 11 more files in changeset.
]]> lams-github (v4.7): LDEV-4696 Rewrite part of Common entities to Hibernate annotations Fri, 02 Nov 2018 15:32:36 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=47043f84205046a23497bf8c57060e2dcadf0c9a https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=47043f84205046a23497bf8c57060e2dcadf0c9a Marcin Cieslak committed 47043f8 on branch v4.7, v4.8 in lams-github LDEV-4696 Rewrite part of Common entities to Hibernate annotations

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (-389, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml (-51, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml (-86, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml (-141, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml (-120, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (-273, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml (-136, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (-270, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml (-76, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml (-117, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml (-59, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (-41, +80) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java (-9, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java (-12, +5) | History | Source | Diff
… 45 more files in changeset.
]]> lams-github (v4.7): LDEV-4696 TZ, Notebook entry, Log Event, Signup, Policies converted Mon, 29 Oct 2018 07:13:18 +0100 Fiona Malikoff <Fiona.Malikoff@gmail.com> https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e Fiona Malikoff <Fiona.Malikoff@gmail.com> committed 2959fa5 on branch v4.7, v4.8 in lams-github LDEV-4696 TZ, Notebook entry, Log Event, Signup, Policies converted

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml (-107, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEventType.hbm.xml (-53, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml (-106, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml (-68, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/PolicyConsent.hbm.xml (-34, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml (-149, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml (-56, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-1, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java (-29, +23) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java (-0, +16) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java (-0, +25) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (-8, +34) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java (-5, +19) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (-1, +39) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/timezone/Timezone.java (-0, +14) | History | Source | Diff
]]> lams-github (v4.7): Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration... Sat, 15 Sep 2018 07:22:02 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=62aaf160878735888d077bf28fac3c1989bb8fbd https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=62aaf160878735888d077bf28fac3c1989bb8fbd 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): Merge remote-tracking branch &#039;origin/master&#039; into lams31... Sun, 09 Sep 2018 19:55:53 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=344a7854d00abbb7a6bb0bb3756970234be71f76 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=344a7854d00abbb7a6bb0bb3756970234be71f76 Marcin Cieslak committed 344a785 on branch v4.7, v4.8 in lams-github Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

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/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

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

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

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

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

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/.classpath

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

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

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

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

lams_tool_assessment/.classpath

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

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

lams_tool_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

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

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

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/LearningAction.java

lams_tool_lamc/.classpath

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

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

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

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/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

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

lams_tool_sbmt/.classpath

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

lams_tool_scratchie/.classpath

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

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

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

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

lams_tool_task/.classpath

lams_tool_vote/.classpath

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

lams_tool_wiki/.classpath

· /lams_admin/.classpath (-1, +0) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (-7, +3) | History | Source | Diff
· /lams_build/conf/standalone.xml (-1, +1) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/.classpath (-4, +0) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-21, +19) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-272, +28) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java (-0, +142) | History | Source
· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java (-19, +24) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java (-6, +16) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-17, +22) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java (-6, +6) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (-6, +4) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java (-9, +10) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java (-3, +6) | History | Source | Diff
… 89 more files in changeset.
]]> lams-github (v4.7): LDEV-4645 Add default lesson settings to integrated servers Tue, 21 Aug 2018 17:10:39 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=9d95acc370aaf50efff1ff08f51751cffd302604 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=9d95acc370aaf50efff1ff08f51751cffd302604 Marcin Cieslak committed 9d95acc on branch v4.7, v4.8 in lams-github LDEV-4645 Add default lesson settings to integrated servers

· /lams_admin/conf/language/lams/ApplicationResources.properties (-2, +8) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts-config.xml (-0, +7) | History | Source | Diff
· /lams_admin/web/servermaintain.jsp (-0, +37) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java (-29, +34) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (-17, +30) | History | Source | Diff
· /lams_central/web/css/outcome.css (-0, +27) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml (-1, +23) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql (-0, +21) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java (-10, +90) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4644 Display and edit outcome results in monitor gradebook Sun, 19 Aug 2018 17:14:24 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=73e57b8ca1a3ddd6cd15b00240d90b79c5de063a https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=73e57b8ca1a3ddd6cd15b00240d90b79c5de063a Marcin Cieslak committed 73e57b8 on branch v4.7, v4.8 in lams-github LDEV-4644 Display and edit outcome results in monitor gradebook

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (-0, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-8, +18) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java (-0, +88) | History | Source | Diff
· /lams_central/web/css/x-editable-lams.css (-0, +19) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeResult.hbm.xml (-1, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java (-0, +5) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java (-0, +28) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java (-0, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java (-0, +22) | History | Source | Diff
· /lams_gradebook/conf/language/lams/ApplicationResources.properties (-0, +3) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (-25, +26) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java (-12, +20) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml (-0, +1) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (-2, +39) | History | Source | Diff
… 4 more files in changeset.
]]> lams-github (v4.7): LDEV-4644 Add OutcomeAutor tag for outcome mapping Tue, 14 Aug 2018 12:21:57 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=a1bfe9d7972867fa2a0bcacc2bf263a9e34c856b https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=a1bfe9d7972867fa2a0bcacc2bf263a9e34c856b Marcin Cieslak committed a1bfe9d on branch v4.7, v4.8 in lams-github LDEV-4644 Add OutcomeAutor tag for outcome mapping

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java (-3, +147) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/Outcome.hbm.xml (-1, +2) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeMapping.hbm.xml (-0, +25) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeResult.hbm.xml (-0, +39) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScale.hbm.xml (-2, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180802.sql (-0, +25) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java (-3, +6) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java (-0, +54) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeResult.java (-0, +65) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java (-1, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java (-1, +5) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java (-0, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java (-5, +56) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java (-2, +8) | History | Source | Diff
… 6 more files in changeset.
]]> lams-github (v4.7): LDEV-4644 Add scale management Thu, 09 Aug 2018 10:23:09 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=846f7b4c76f01650ce4a2df946772bafc4228dcf https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=846f7b4c76f01650ce4a2df946772bafc4228dcf Marcin Cieslak committed 846f7b4 on branch v4.7, v4.8 in lams-github LDEV-4644 Add scale management

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-2, +12) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java (-35, +202) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeScaleForm.java (-0, +93) | History | Source
· /lams_central/web/WEB-INF/struts-config.xml (-5, +19) | History | Source | Diff
· /lams_central/web/css/outcome.scss (-3, +7) | History | Source | Diff
· /lams_central/web/includes/javascript/main.js (-1, +0) | History | Source | Diff
· /lams_central/web/includes/javascript/outcome.js (-8, +55) | History | Source | Diff
· /lams_central/web/outcome/outcomeEdit.jsp (-11, +16) | History | Source | Diff
· /lams_central/web/outcome/outcomeManage.jsp (-49, +54) | History | Source | Diff
· /lams_central/web/outcome/scaleEdit.jsp (-0, +115) | History | Source
· /lams_central/web/outcome/scaleManage.jsp (-0, +99) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScale.hbm.xml (-1, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java (-4, +25) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java (-0, +3) | History | Source | Diff
… 3 more files in changeset.
]]> lams-github (v4.7): LDEV-4644 Add content folder ID for CKEditor to outcomes and scales Wed, 08 Aug 2018 11:16:48 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=313e29d4010a35282a7c56dd24971e40b442dfb0 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=313e29d4010a35282a7c56dd24971e40b442dfb0 Marcin Cieslak committed 313e29d on branch v4.7, v4.8 in lams-github LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java (-17, +24) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java (-2, +11) | History | Source | Diff
· /lams_central/web/includes/javascript/outcome.js (-3, +2) | History | Source | Diff
· /lams_central/web/outcome/outcomeEdit.jsp (-1, +2) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/Outcome.hbm.xml (-0, +3) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScale.hbm.xml (-2, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-1, +27) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180802.sql (-0, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java (-0, +9) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java (-0, +9) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java (-0, +5) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java (-0, +29) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java (-0, +11) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java (-0, +24) | History | Source
]]> lams-github (v4.7): LDEV-4644 Add outcomes model Thu, 02 Aug 2018 16:56:52 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=f6222f18a5fc2d8d13d7514afadef0fb204fb968 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=f6222f18a5fc2d8d13d7514afadef0fb204fb968 Marcin Cieslak committed f6222f1 on branch v4.7, v4.8 in lams-github LDEV-4644 Add outcomes model

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/Outcome.hbm.xml (-0, +42) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScale.hbm.xml (-0, +43) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeScaleItem.hbm.xml (-0, +24) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180802.sql (-0, +49) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java (-0, +81) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java (-0, +84) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java (-0, +41) | History | Source
]]> lams-github (v4.7): LDEV-4639 Use tour instead of tutorials video on first login... Mon, 30 Jul 2018 16:40:08 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=7acb20e485013e119c7dfd90854f123c09f147cb https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=7acb20e485013e119c7dfd90854f123c09f147cb Marcin Cieslak committed 7acb20e on branch v4.7, v4.8 in lams-github LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (-3, +2) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts-config.xml (-1, +0) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-3, +0) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (-1, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java (-170, +0) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (-20, +0) | History | Source | Diff
· /lams_central/web/WEB-INF/struts-config.xml (-9, +0) | History | Source | Diff
· /lams_central/web/css/pedagogicalPlanner.css (-13, +0) | History | Source | Diff
· /lams_central/web/main.jsp (-7, +2) | History | Source | Diff
· /lams_central/web/profile/editprofile.jsp (-35, +0) | History | Source | Diff
· /lams_central/web/tutorialVideo.jsp (-80, +0) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (-17, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180731.sql (-0, +15) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (-27, +1) | History | Source | Diff
… 5 more files in changeset.
]]> lams-github (v4.7): Monthly merge from master to lams31... Wed, 18 Jul 2018 15:02:14 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=266434d5ec15cc4026c93a740c3110c046b1d88a https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=266434d5ec15cc4026c93a740c3110c046b1d88a Marcin Cieslak committed 266434d on branch v4.7, v4.8 in lams-github Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

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

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

· /3rdParty_sources/versions.txt (-0, +2) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java (-14, +4) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java (-0, +295) | History | Source
· /lams_build/3rdParty.userlibraries (-0, +1) | History | Source | Diff
· /lams_build/build.xml (-0, +7) | History | Source | Diff
· /lams_build/conf/j2ee/jboss-deployment-structure.xml (-0, +1) | History | Source | Diff
· /lams_build/lib/jdk/jdk.module.xml (-0, +1) | History | Source | Diff
· /lams_build/lib/lams/lams-central.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams-gradebook.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_build/liblist.txt (-0, +2) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (-0, +15) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (-0, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +29) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (-13, +33) | History | Source | Diff
… 12 more files in changeset.
]]> lams-github (v4.7): LDEV-4617 Implement full email verification on sign up Wed, 18 Jul 2018 08:33:46 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8 Marcin Cieslak committed 5cf9e6a on branch v4.7, v4.8 in lams-github LDEV-4617 Implement full email verification on sign up

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-0, +3) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java (-28, +95) | History | Source | Diff
· /lams_central/web/WEB-INF/struts-config.xml (-0, +10) | History | Source | Diff
· /lams_central/web/signup/emailVerify.jsp (-0, +37) | History | Source
· /lams_central/web/signup/emailVerifyResult.jsp (-0, +45) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (-0, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/service/ISignupService.java (-1, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java (-1, +15) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (-9, +15) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4617 Add an option to enable email verification on sign up Tue, 17 Jul 2018 15:36:23 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=04f70c56cf4d63d83a332402a572c9062f318bbf https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=04f70c56cf4d63d83a332402a572c9062f318bbf Marcin Cieslak committed 04f70c5 on branch v4.7, v4.8 in lams-github LDEV-4617 Add an option to enable email verification on sign up

· /lams_admin/conf/language/lams/ApplicationResources.properties (-0, +2) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java (-0, +2) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts-config.xml (-0, +1) | History | Source | Diff
· /lams_admin/web/css/admin.scss (-0, +5) | History | Source | Diff
· /lams_admin/web/signupmanagement/add.jsp (-0, +6) | History | Source | Diff
· /lams_admin/web/signupmanagement/list.jsp (-0, +4) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml (-0, +9) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180717.sql (-0, +15) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (-0, +9) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4616 Remove locale from courses Sat, 07 Jul 2018 17:51:44 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f Marcin Cieslak committed 68f6bb7 on branch v4.7, v4.8 in lams-github LDEV-4616 Remove locale from courses

· /lams_admin/conf/language/lams/ApplicationResources.properties (-1, +0) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (-15, +4) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java (-21, +0) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java (-14, +4) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts-config.xml (-1, +0) | History | Source | Diff
· /lams_admin/web/organisation/courseAdminEdit.jsp (-12, +0) | History | Source | Diff
· /lams_admin/web/organisation/createOrEdit.jsp (-12, +0) | History | Source | Diff
· /lams_admin/web/organisation/list.jsp (-8, +0) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (-11, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180707.sql (-0, +15) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (-3, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (-10, +0) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4609 Calculate dates and status for archived progress... Sat, 30 Jun 2018 07:22:14 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=0ed9749f00a1e1f92b989b270857d7f3c3f237cb https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=0ed9749f00a1e1f92b989b270857d7f3c3f237cb Marcin Cieslak committed 0ed9749 on branch v4.7, v4.8 in lams-github LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.
· /lams_build/lib/lams/lams-gradebook.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml (-1, +7) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180628.sql (-0, +6) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java (-1, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgressArchive.java (-1, +22) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java (-0, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (-2, +12) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (-20, +75) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-2, +4) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4609 Add archive date to gradebook marks on lesson restart Thu, 28 Jun 2018 08:41:11 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=bfc093eb87907e66a284fd1c30cf0f212122f706 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=bfc093eb87907e66a284fd1c30cf0f212122f706 Marcin Cieslak committed bfc093e on branch v4.7, v4.8 in lams-github LDEV-4609 Add archive date to gradebook marks on lesson restart

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lams/gradebook/GradebookUserActivityArchive.hbm.xml (-0, +8) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml (-0, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180628.sql (-0, +18) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java (-2, +11) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java (-1, +13) | History | Source | Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (-4, +5) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4593 Further develop Policies &amp; consents feature Sat, 23 Jun 2018 02:23:28 +0200 Andrey Balan https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=4c134bb552fd30a24e610ddd532846ec38a3a51c https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=4c134bb552fd30a24e610ddd532846ec38a3a51c Andrey Balan committed 4c134bb on branch v4.7, v4.8 in lams-github LDEV-4593 Further develop Policies & consents feature

· /lams_admin/conf/language/lams/ApplicationResources.properties (-7, +6) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java (-59, +87) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (-1, +1) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java (-0, +37) | History | Source
· /lams_admin/web/WEB-INF/struts-config.xml (-0, +6) | History | Source | Diff
· /lams_admin/web/WEB-INF/tiles-defs.xml (-2, +2) | History | Source | Diff
· /lams_admin/web/policies/edit.jsp (-138, +0) | History | Source | Diff
· /lams_admin/web/policies/editPolicy.jsp (-0, +143) | History | Source
· /lams_admin/web/policies/list.jsp (-115, +0) | History | Source | Diff
· /lams_admin/web/policies/policies.jsp (-0, +164) | History | Source
· /lams_admin/web/policies/previousVersionsList.jsp (-81, +0) | History | Source | Diff
· /lams_admin/web/policies/userConsents.jsp (-0, +82) | History | Source
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties (-0, +19) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (-1, +11) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java (-1, +26) | History | Source | Diff
… 13 more files in changeset.
]]> lams-github (v4.7): LDEV-4593 Introduce Policies &amp; consent feature Thu, 31 May 2018 17:01:46 +0200 Andrey Balan https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=52ed825cf80fc4c9f1b9e114c80b09913e86002e https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=52ed825cf80fc4c9f1b9e114c80b09913e86002e Andrey Balan committed 52ed825 on branch v4.7, v4.8 in lams-github LDEV-4593 Introduce Policies & consent feature

· /lams_admin/conf/language/lams/ApplicationResources.properties (-0, +31) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java (-0, +265) | History | Source
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (-0, +1) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts-config.xml (-0, +37) | History | Source | Diff
· /lams_admin/web/WEB-INF/tiles-defs.xml (-0, +12) | History | Source | Diff
· /lams_admin/web/policies/edit.jsp (-0, +138) | History | Source
· /lams_admin/web/policies/list.jsp (-0, +115) | History | Source
· /lams_admin/web/policies/previousVersionsList.jsp (-0, +81) | History | Source
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (-0, +5) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java (-0, +153) | History | Source
· /lams_central/web/WEB-INF/struts-config.xml (-1, +21) | History | Source | Diff
· /lams_central/web/policyConsents.jsp (-0, +50) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml (-0, +68) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/PolicyConsent.hbm.xml (-0, +34) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +28) | History | Source | Diff
… 7 more files in changeset.
]]> lams-github (v4.7): LDEV-4587 Distinguish ordered branching by introducing a new field... Tue, 22 May 2018 11:59:21 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=287e1d4f1242a8d584f71cab96bfd0365b6855c8 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=287e1d4f1242a8d584f71cab96bfd0365b6855c8 Marcin Cieslak committed 287e1d4 on branch v4.7, v4.8 in lams-github LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-0, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-0, +3) | History | Source | Diff
· /lams_central/web/authoring/authoring.jsp (-0, +6) | History | Source | Diff
· /lams_central/web/css/_authoring_base.scss (-0, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-1, +2) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-0, +2) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-4, +18) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (-0, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180522.sql (-0, +15) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java (-4, +14) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (-0, +14) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java (-4, +7) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java (-0, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-2, +2) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4559 Comments can be left anonymously. Wed, 09 May 2018 07:59:52 +0200 Fiona Malikoff <Fiona.Malikoff@gmail.com> https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=500ae45f4243aa718eac7436bc903b4f137a3aa7 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=500ae45f4243aa718eac7436bc903b4f137a3aa7 Fiona Malikoff <Fiona.Malikoff@gmail.com> committed 500ae45 on branch v4.7, v4.8 in lams-github LDEV-4559 Comments can be left anonymously.

· /lams_admin/web/WEB-INF/tags/Comments.tag (-1, +6) | History | Source | Diff
· /lams_admin/web/WEB-INF/tags/CommentsAuthor.tag (-1, +22) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-0, +3) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java (-0, +5) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java (-5, +14) | History | Source | Diff
· /lams_central/web/WEB-INF/tags/Comments.tag (-1, +6) | History | Source | Diff
· /lams_central/web/WEB-INF/tags/CommentsAuthor.tag (-1, +22) | History | Source | Diff
· /lams_central/web/comments/anonymouscheckbox.jsp (-0, +23) | History | Source
· /lams_central/web/comments/edit.jsp (-7, +26) | History | Source | Diff
· /lams_central/web/comments/msgview.jsp (-8, +37) | History | Source | Diff
· /lams_central/web/comments/new.jsp (-9, +18) | History | Source | Diff
· /lams_central/web/comments/reply.jsp (-8, +27) | History | Source | Diff
· /lams_central/web/css/_learner_base.scss (-0, +5) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml (-0, +9) | History | Source | Diff
… 78 more files in changeset.
]]> lams-github (v4.7): LDEV-4538 Persist new gate parameters: open user and time Thu, 29 Mar 2018 11:53:19 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=664113e5a7f816094b983d8c601e0de4a4b2d19d https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=664113e5a7f816094b983d8c601e0de4a4b2d19d Marcin Cieslak committed 664113e on branch v4.7, v4.8 in lams-github LDEV-4538 Persist new gate parameters: open user and time

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (-0, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180329.sql (-0, +13) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (-1, +20) | History | Source | Diff
]]> lams-github (v4.7): LDEV-4501 All Audit Log entries are now Log Event entries Thu, 22 Feb 2018 02:55:08 +0100 Fiona Malikoff <Fiona.Malikoff@gmail.com> https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 Fiona Malikoff <Fiona.Malikoff@gmail.com> committed 045ebfd on branch v4.7, v4.8 in lams-github LDEV-4501 All Audit Log entries are now Log Event entries

· /lams_admin/conf/language/lams/ApplicationResources.properties (-1, +4) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java (-2, +16) | History | Source | Diff
· /lams_admin/web/logevent.jsp (-12, +44) | History | Source | Diff
· /lams_build/conf/domain.xml (-15, +0) | History | Source | Diff
· /lams_build/conf/slim/standalone.xml (-19, +0) | History | Source | Diff
· /lams_build/conf/standalone.xml (-19, +0) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-0, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-4, +4) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (-9, +9) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml (-5, +10) | History | Source | Diff
· /lams_common/conf/language/lams/ApplicationResources.properties (-5, +6) | History | Source | Diff
· /lams_common/conf/language/lams/ApplicationResources_en_AU.properties (-5, +6) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java (-1, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/comments/commentsContext.xml (-1, +2) | History | Source | Diff
… 51 more files in changeset.
]]> lams-github (v4.7): LDEV-4501 Tool context files no longer reference audit service. Tue, 06 Feb 2018 05:17:20 +0100 Fiona Malikoff <Fiona.Malikoff@gmail.com> https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=fcc5eca8a605afdc9e927366827553a7862000cd https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=fcc5eca8a605afdc9e927366827553a7862000cd Fiona Malikoff <Fiona.Malikoff@gmail.com> committed fcc5eca on branch v4.7, v4.8 in lams-github LDEV-4501 Tool context files no longer reference audit service.

· /lams_admin/conf/language/lams/ApplicationResources.properties (-0, +30) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml (-2, +2) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java (-7, +7) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java (-1, +1) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (-20, +23) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java (-1, +3) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java (-18, +29) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java (-15, +24) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java (-9, +17) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java (-2, +2) | History | Source | Diff
· /lams_admin/web/logevent.jsp (-6, +21) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-8, +9) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (-2, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java (-4, +4) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java (-4, +4) | History | Source | Diff
… 48 more files in changeset.
]]>