lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Wednesday 26 Sep 2018
4:28 am

Andrey Balan

LDEV-4440 <input> tag can't have a closing tag in HTML

Also change <input type="submit"></input> into <button>, as otherwise

button's label is displayed incorrectly

Options
    • -1
    • +2
    ./web/addLesson.jsp
    • -26
    • +29
    ./web/authoring/authoring.jsp
    • -6
    • +6
    ./web/authoring/template/grouping.jsp
    • -3
    • +2
    ./web/extGroups.jsp
  5. … 12 more files in changeset.
Monday 24 Sep 2018
10:23 pm

Marcin Cieslak

LDEV-4440 Migrate Planner to Spring MVC

Also several minor fixes to Planner logic

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./web/includes/javascript/openUrls.js
  3. … 1 more file in changeset.
Sunday 23 Sep 2018
6:27 pm

Marcin Cieslak

LDEV-4440 Adjust lams:textarea tag to support "disabled" attribute

Options
    • -14
    • +22
    ./src/java/org/lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java
    • -0
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 33 more files in changeset.
Saturday 22 Sep 2018
5:05 pm

Marcin Cieslak

LDEV-4440 Fix a malformed Spring tag in Comments tag

Options
    • -6
    • +2
    ./web/WEB-INF/tags/CommentsAuthor.tag
  2. … 119 more files in changeset.
4:56 pm

Marcin Cieslak

LDEV-4440 Always get idle timeout from current configuration cache

Options
    • -6
    • +1
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
4:13 pm

Marcin Cieslak

LDEV-4440 Fix chosen grouping

Options
    • -1
    • +1
    ./web/includes/javascript/orgGroup.js
    • -13
    • +11
    ./web/orgGroup.jsp
  3. … 4 more files in changeset.
1:32 am

Andrey Balan

LDEV-4440 Merge FileValidatorSpringUtil and FileValidatorUtil into FileValidatorUtil

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
  3. … 21 more files in changeset.
1:22 am

Andrey Balan

LDEV-4440 All projects start using solely 3rdParty.userlibraries

Options
    • -1
    • +1
    ./.classpath
  2. … 35 more files in changeset.
1:20 am

Andrey Balan

LDEV-4440 Finally remove Struts and all related code

Options
    • -1
    • +0
    ./web/forgotPassword.jsp
    • -1
    • +0
    ./web/forgotPasswordChange.jsp
    • -1
    • +0
    ./web/forgotPasswordProc.jsp
    • -2
    • +1
    ./web/passwordChangeContent.jsp
  5. … 25 more files in changeset.
Friday 21 Sep 2018
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Options
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 28 more files in changeset.
Wednesday 19 Sep 2018
12:39 am

Marcin Cieslak

LDEV-4440 Fix paths to JSP pages for profile controller

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/web/ProfileController.java
12:32 am

Marcin Cieslak

LDEV-4440 Fix entry to Live Edit

It seems that it was a problem with bootstrapping authoring rather than

migration to Spring MVC.

Options
    • -3
    • +4
    ./web/includes/javascript/authoring/authoringGeneral.js
Tuesday 18 Sep 2018
3:46 pm

Marcin Cieslak

Merge remote-tracking branch 'andrey/LDEV-4440' into LDEV-4440

Options
    • -11
    • +12
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -21
    • +16
    ./web/WEB-INF/web.xml
  3. … 2 more files in changeset.
8:41 am

Andrey Balan

LDEV-4440 Stop using deprecated DiskFileUpload

Use ServletFileUpload together with DiskFileItemFactory instead.

Options
    • -11
    • +12
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -25
    • +26
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -17
    • +21
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
  4. … 2 more files in changeset.
2:48 am

Marcin Cieslak

LDEV-4440 Fix JSON result in learning outcomes controller

Options
    • -18
    • +19
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
Monday 17 Sep 2018
5:24 pm

Marcin Cieslak

LDEV-4440 Distribute same tags to all projects

Options
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -10
    • +5
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 216 more files in changeset.
4:41 pm

Marcin Cieslak

LDEV-4440 Get rid of tags-html library references from JSP and tag files

Options
    • -1
    • +1
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    ./web/policyConsents.jsp
    • -1
    • +1
    ./web/profile/policyDetails.jsp
    • -1
    • +1
    ./web/profile/profilePolicyConsents.jsp
    • -1
    • +1
    ./web/signup/emailVerify.jsp
    • -1
    • +1
    ./web/signup/emailVerifyResult.jsp
  7. … 42 more files in changeset.
Saturday 15 Sep 2018
1:41 pm

Marcin Cieslak

Merges Asia's and Andrey's changes into LDEV-4440

Conflicts:

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

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

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

Options
    • -1
    • +1
    ./web/includes/javascript/dialog.js
  2. … 8 more files in changeset.
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
    • -4
    • +0
    ./.classpath
    • -0
    • +1
    ./.gitignore
    • -1
    • +0
    ./build.xml
    • -13
    • +86
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +29
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +42
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -24
    • +60
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -21
    • +19
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -278
    • +46
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -78
    • +60
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -11
    • +21
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -6
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -63
    • +21
    ./src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java
  16. … 634 more files in changeset.
Friday 14 Sep 2018
3:51 am

Andrey Balan

LDEV-4440 Add MultipartFilter

This filter is an alternative to using DispatcherServlet's

MultipartResolver support, for example for web applications with custom

web views which do not use Spring's web MVC (e.g. LAMS Servlets).

Options
    • -21
    • +16
    ./web/WEB-INF/web.xml
Monday 10 Sep 2018
2:36 am

Marcin Cieslak

LDEV-4649 Fix outcome/scale export file extension

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
2:10 am

Marcin Cieslak

Merge learning outcomes LDEV-4644 into lams31

Options
    • -1
    • +43
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -1
    • +30
    ./web/WEB-INF/struts-config.xml
    • -0
    • +4
    ./web/main.jsp
    • -27
    • +0
    ./web/css/outcome.css
    • -45
    • +0
    ./web/css/outcome.scss
  8. … 8 more files in changeset.
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
    • -4
    • +0
    ./.classpath
    • -21
    • +19
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -272
    • +28
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +142
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -19
    • +24
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -6
    • +16
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -17
    • +22
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/rest/RestServlet.java
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -9
    • +10
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/webservice/RegisterAction.java
    • -18
    • +9
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -2
    • +13
    ./web/WEB-INF/web.xml
  15. … 90 more files in changeset.
Saturday 08 Sep 2018
3:55 am

Andrey Balan

LDEV-4658 Add new config setting "Enable profile portrait editing"

Options
    • -0
    • +4
    ./web/includes/javascript/webrtc-capturestill.js
    • -67
    • +73
    ./web/profile/portrait.jsp
  3. … 3 more files in changeset.
Tuesday 04 Sep 2018
5:00 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 fixed paths at Central

Options
    • -2
    • +2
    ./web/emailuser.jsp
    • -1
    • +1
    ./web/includes/javascript/dialog.js
Friday 31 Aug 2018
6:08 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning branching fixes

Options
    • -22
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
  2. … 2 more files in changeset.
5:19 pm

Marcin Cieslak

LDEV-4440 Various fixes in admin

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/LoginAsController.java
    • -4
    • +5
    ./web/login.jsp
  3. … 6 more files in changeset.
5:13 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 EXportContetContrller

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
5:13 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Portrait fix

Options
    • -32
    • +34
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
    • -2
    • +2
    ./web/authoring/template/comms.jsp
    • -8
    • +8
    ./web/includes/javascript/openUrls.js
    • -4
    • +4
    ./web/portrait.jsp
  6. … 4 more files in changeset.
11:23 am

Marcin Cieslak

LDEV-4649 Outcome import

Options
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -8
    • +28
    ./web/outcome/outcomeManage.jsp
  3. … 3 more files in changeset.