lams-github / lams_common / conf / hibernate / mappings

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 22
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 09 Nov 2018
6:37 pm

Marcin Cieslak

LDEV-4696 Remove hbm.xml file remains

Options
    • -76
    • +0
    ./lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
  2. … 2 more files in changeset.
Tuesday 06 Nov 2018
6:50 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy

Options
    • -167
    • +0
    ./lamsfoundation/lams/comments/Comment.hbm.xml
    • -51
    • +0
    ./lamsfoundation/lams/comments/CommentLike.hbm.xml
    • -58
    • +0
    ./lamsfoundation/lams/comments/CommentSession.hbm.xml
    • -77
    • +0
    ./lamsfoundation/lams/rating/Rating.hbm.xml
    • -85
    • +0
    ./lamsfoundation/lams/rating/RatingComment.hbm.xml
    • -92
    • +0
    ./lamsfoundation/lams/rating/RatingCriteria.hbm.xml
  7. … 29 more files in changeset.
4:03 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -63
    • +0
    ./lamsfoundation/lams/events/EmailNotificationArchive.hbm.xml
    • -115
    • +0
    ./lamsfoundation/lams/events/Event.hbm.xml
    • -74
    • +0
    ./lamsfoundation/lams/events/Subscription.hbm.xml
    • -86
    • +0
    ./lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
    • -67
    • +0
    ./lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
    • -223
    • +0
    ./lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -63
    • +0
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
    • -82
    • +0
    ./lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
    • -46
    • +0
    ./lamsfoundation/lams/outcome/Outcome.hbm.xml
    • -25
    • +0
    ./lamsfoundation/lams/outcome/OutcomeMapping.hbm.xml
    • -39
    • +0
    ./lamsfoundation/lams/outcome/OutcomeResult.hbm.xml
    • -48
    • +0
    ./lamsfoundation/lams/outcome/OutcomeScale.hbm.xml
    • -24
    • +0
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.hbm.xml
  14. … 14 more files in changeset.
Monday 05 Nov 2018
3:57 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -44
    • +0
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml
    • -0
    • +0
    ./lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -70
    • +0
    ./lamsfoundation/lams/learningdesign/Competence.hbm.xml
    • -63
    • +0
    ./lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml
    • -20
    • +0
    ./lamsfoundation/lams/learningdesign/GroupUser.hbm.xml
    • -20
    • +0
    ./lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml
    • -32
    • +0
    ./lamsfoundation/lams/learningdesign/LearningDesignAnnotation.hbm.xml
    • -80
    • +0
    ./lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
    • -66
    • +0
    ./lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml
    • -21
    • +0
    ./lamsfoundation/lams/learningdesign/License.hbm.xml
    • -206
    • +0
    ./lamsfoundation/lams/tool/SystemTool.hbm.xml
    • -78
    • +0
    ./lamsfoundation/lams/tool/ToolContent.hbm.xml
    • -105
    • +0
    ./lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml
    • -88
    • +0
    ./lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml
    • -70
    • +0
    ./lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml
  16. … 40 more files in changeset.
Sunday 04 Nov 2018
5:48 pm

Marcin Cieslak

LDEV-4696 Remove obsolete DTO

Options
    • -188
    • +0
    ./lamsfoundation/lams/tool/BasicToolVO.hbm.xml
  2. … 14 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -84
    • +0
    ./lamsfoundation/lams/config/ConfigurationItem.hbm.xml
    • -97
    • +0
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
    • -80
    • +0
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml
    • -22
    • +0
    ./lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml
    • -22
    • +0
    ./lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml
    • -85
    • +0
    ./lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
    • -68
    • +0
    ./lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
    • -84
    • +0
    ./lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml
    • -84
    • +0
    ./lamsfoundation/lams/themes/Theme.hbm.xml
    • -382
    • +0
    ./lamsfoundation/lams/tool/Tool.hbm.xml
    • -401
    • +0
    ./lamsfoundation/lams/usermanagement/User.hbm.xml
  12. … 15 more files in changeset.
Friday 02 Nov 2018
10:32 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -389
    • +0
    ./lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -51
    • +0
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
    • -86
    • +0
    ./lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml
    • -141
    • +0
    ./lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -120
    • +0
    ./lamsfoundation/lams/learningdesign/Grouping.hbm.xml
    • -273
    • +0
    ./lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -136
    • +0
    ./lamsfoundation/lams/learningdesign/Transition.hbm.xml
    • -270
    • +0
    ./lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -76
    • +0
    ./lamsfoundation/lams/tool/ToolSession.hbm.xml
    • -117
    • +0
    ./lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
    • -59
    • +0
    ./lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml
  12. … 49 more files in changeset.
Monday 29 Oct 2018
2:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 TZ, Notebook entry, Log Event, Signup, Policies converted

Options
    • -107
    • +0
    ./lamsfoundation/lams/logevent/LogEvent.hbm.xml
    • -53
    • +0
    ./lamsfoundation/lams/logevent/LogEventType.hbm.xml
    • -106
    • +0
    ./lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml
    • -68
    • +0
    ./lamsfoundation/lams/policies/Policy.hbm.xml
    • -34
    • +0
    ./lamsfoundation/lams/policies/PolicyConsent.hbm.xml
    • -149
    • +0
    ./lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
    • -56
    • +0
    ./lamsfoundation/lams/timezone/Timezone.hbm.xml
  8. … 8 more files in changeset.
Saturday 15 Sep 2018
1:22 pm

Marcin Cieslak

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

Options
    • -1
    • +23
    ./lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -1
    • +7
    ./lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
    • -0
    • +9
    ./lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
    • -11
    • +0
    ./lamsfoundation/lams/usermanagement/Organisation.hbm.xml
    • -17
    • +3
    ./lamsfoundation/lams/usermanagement/User.hbm.xml
  6. … 644 more files in changeset.
Monday 10 Sep 2018
1:55 am

Marcin Cieslak

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

Options
    • -17
    • +0
    ./lamsfoundation/lams/usermanagement/User.hbm.xml
  2. … 103 more files in changeset.
Tuesday 21 Aug 2018
11:10 pm

Marcin Cieslak

LDEV-4645 Add default lesson settings to integrated servers

Options
    • -1
    • +23
    ./lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
  2. … 8 more files in changeset.
Sunday 19 Aug 2018
11:14 pm

Marcin Cieslak

LDEV-4644 Display and edit outcome results in monitor gradebook

Options
    • -1
    • +1
    ./lamsfoundation/lams/outcome/OutcomeResult.hbm.xml
  2. … 18 more files in changeset.
Tuesday 14 Aug 2018
6:21 pm

Marcin Cieslak

LDEV-4644 Add OutcomeAutor tag for outcome mapping

Options
    • -1
    • +2
    ./lamsfoundation/lams/outcome/Outcome.hbm.xml
    • -0
    • +25
    ./lamsfoundation/lams/outcome/OutcomeMapping.hbm.xml
    • -0
    • +39
    ./lamsfoundation/lams/outcome/OutcomeResult.hbm.xml
    • -2
    • +4
    ./lamsfoundation/lams/outcome/OutcomeScale.hbm.xml
  5. … 17 more files in changeset.
Thursday 09 Aug 2018
4:23 pm

Marcin Cieslak

LDEV-4644 Add scale management

Options
    • -1
    • +4
    ./lamsfoundation/lams/outcome/OutcomeScale.hbm.xml
  2. … 17 more files in changeset.
Wednesday 08 Aug 2018
5:16 pm

Marcin Cieslak

LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

Options
    • -0
    • +3
    ./lamsfoundation/lams/outcome/Outcome.hbm.xml
    • -2
    • +2
    ./lamsfoundation/lams/outcome/OutcomeScale.hbm.xml
  3. … 13 more files in changeset.
Thursday 02 Aug 2018
10:56 pm

Marcin Cieslak

LDEV-4644 Add outcomes model

Options
    • -0
    • +42
    ./lamsfoundation/lams/outcome/Outcome.hbm.xml
    • -0
    • +43
    ./lamsfoundation/lams/outcome/OutcomeScale.hbm.xml
    • -0
    • +24
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.hbm.xml
  4. … 5 more files in changeset.
Monday 30 Jul 2018
10:40 pm

Marcin Cieslak

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.

Options
    • -17
    • +0
    ./lamsfoundation/lams/usermanagement/User.hbm.xml
  2. … 19 more files in changeset.
Wednesday 18 Jul 2018
9:02 pm

Marcin Cieslak

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

Options
    • -0
    • +3
    ./lamsfoundation/lams/usermanagement/User.hbm.xml
  2. … 26 more files in changeset.
2:33 pm

Marcin Cieslak

LDEV-4617 Implement full email verification on sign up

Options
    • -0
    • +3
    ./lamsfoundation/lams/usermanagement/User.hbm.xml
  2. … 9 more files in changeset.
Tuesday 17 Jul 2018
9:36 pm

Marcin Cieslak

LDEV-4617 Add an option to enable email verification on sign up

Options
    • -0
    • +9
    ./lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
  2. … 9 more files in changeset.
Saturday 07 Jul 2018
11:51 pm

Marcin Cieslak

LDEV-4616 Remove locale from courses

Options
    • -11
    • +0
    ./lamsfoundation/lams/usermanagement/Organisation.hbm.xml
  2. … 12 more files in changeset.
Saturday 30 Jun 2018
1:22 pm

Marcin Cieslak

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.

Options
    • -1
    • +7
    ./lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
  2. … 10 more files in changeset.
Thursday 28 Jun 2018
2:41 pm

Marcin Cieslak

LDEV-4609 Add archive date to gradebook marks on lesson restart

Options
    • -0
    • +8
    ./lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml
    • -0
    • +8
    ./lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml
  3. … 5 more files in changeset.
Saturday 23 Jun 2018
8:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -1
    • +1
    ./lamsfoundation/lams/policies/Policy.hbm.xml
  2. … 27 more files in changeset.
Thursday 31 May 2018
11:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +68
    ./lamsfoundation/lams/policies/Policy.hbm.xml
    • -0
    • +34
    ./lamsfoundation/lams/policies/PolicyConsent.hbm.xml
  3. … 20 more files in changeset.
Tuesday 22 May 2018
5:59 pm

Marcin Cieslak

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).

Options
    • -0
    • +1
    ./lamsfoundation/lams/learningdesign/Activity.hbm.xml
  2. … 14 more files in changeset.
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -0
    • +9
    ./lamsfoundation/lams/comments/Comment.hbm.xml
  2. … 92 more files in changeset.
Thursday 29 Mar 2018
5:53 pm

Marcin Cieslak

LDEV-4538 Persist new gate parameters: open user and time

Options
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/Activity.hbm.xml
  2. … 3 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -5
    • +10
    ./lamsfoundation/lams/logevent/LogEvent.hbm.xml
  2. … 65 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -3
    • +3
    ./lamsfoundation/lams/logevent/LogEvent.hbm.xml
  2. … 62 more files in changeset.