lams-github / lams_tool_pixlr / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
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
Saturday 22 Sep 2018
1:32 am

Andrey Balan

LDEV-4440 Merge FileValidatorSpringUtil and FileValidatorUtil into FileValidatorUtil

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java
  2. … 22 more files in changeset.
Friday 21 Sep 2018
6:17 am

Andrey Balan

LDEV-4440 code formatting

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
  2. … 6 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
    • -6
    • +8
    ./lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
    • -12
    • +1
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/controller/ClearSessionController.java
    • -24
    • +10
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
  6. … 644 more files in changeset.
Tuesday 28 Aug 2018
8:39 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_contentrepository

Options
    • -4
    • +7
    ./lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
    • -79
    • +0
    ./lamsfoundation/lams/tool/pixlr/util/PixlrToolContentHandler.java
  3. … 74 more files in changeset.
Saturday 25 Aug 2018
7:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java
  3. … 108 more files in changeset.
Sunday 19 Aug 2018
1:44 am

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

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

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

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

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

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

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

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

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

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

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
    • -6
    • +6
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  3. … 102 more files in changeset.
Friday 03 Aug 2018
6:46 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe & Scratchie work in progress

Options
    • -2
    • +4
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
  2. … 38 more files in changeset.
Thursday 02 Aug 2018
11:05 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr fixes

Options
    • -7
    • +3
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -10
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java
    • -9
    • +10
    ./lamsfoundation/lams/tool/pixlr/web/forms/LearningForm.java
    • -9
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/forms/MonitoringForm.java
  5. … 3 more files in changeset.
Wednesday 01 Aug 2018
9:30 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr nostruts library

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java
    • -10
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/AdminForm.java
    • -5
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/LearningForm.java
    • -5
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/MonitoringForm.java
  6. … 39 more files in changeset.
6:37 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr fixes

Options
    • -23
    • +24
    ./lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java
    • -8
    • +7
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java
    • -14
    • +7
    ./lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java
  5. … 34 more files in changeset.
Tuesday 31 Jul 2018
8:54 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr & Q&A fixes

Options
    • -67
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/actions/AdminAction.java
    • -393
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
    • -51
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java
    • -492
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
    • -186
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java
    • -0
    • +61
    ./lamsfoundation/lams/tool/pixlr/web/controller/AdminController.java
    • -0
    • +386
    ./lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java
    • -0
    • +67
    ./lamsfoundation/lams/tool/pixlr/web/controller/ClearSessionController.java
    • -0
    • +480
    ./lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -0
    • +175
    ./lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java
    • -8
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/AdminForm.java
    • -21
    • +11
    ./lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/LearningForm.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/MonitoringForm.java
  15. … 36 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
    • -6
    • +6
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  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
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
  2. … 62 more files in changeset.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
    • -12
    • +1
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -6
    • +3
    ./lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
  2. … 78 more files in changeset.
Thursday 02 Nov 2017
8:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 28 more files in changeset.
Friday 07 Apr 2017
10:26 pm

Andrey Balan

LDEV-4308 Fix saving authoring page when image is already uploaded

Options
    • -9
    • +0
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
  2. … 2 more files in changeset.
Thursday 06 Apr 2017
12:32 am

Andrey Balan

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

Options
    • -9
    • +6
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
  2. … 21 more files in changeset.
Tuesday 04 Apr 2017
8:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./lamsfoundation/lams/tool/pixlr/service/IPixlrService.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
  4. … 86 more files in changeset.
Friday 31 Mar 2017
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -30
    • +4
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
  2. … 30 more files in changeset.
Monday 27 Feb 2017
10:00 pm

Marcin Cieslak

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/pixlr/dbupdates/patch20170101.sql
  2. … 223 more files in changeset.
Wednesday 11 Jan 2017
4:57 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

Options
    • -0
    • +13
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 37 more files in changeset.
Monday 15 Aug 2016
3:54 pm

erniegx <ernieg@gmail.com>

LDEV-3952: updating scripts to be compatible with MySQL 5.7

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dbupdates/patch20150930.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/pixlr/dbupdates/patch20151217.sql
  3. … 43 more files in changeset.
Wednesday 15 Jun 2016
4:07 pm

Andrey Balan

LDEV-3750 Improve performance of pushing marks to gradebook

Options
    • -0
    • +6
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 36 more files in changeset.
Monday 13 Jun 2016
10:53 pm

Andrey Balan

LDEV-3750 Added ability to request all available tool outputs per toolContentId instead of querying them one by one

Options
    • -0
    • +6
    ./lamsfoundation/lams/tool/pixlr/service/PixlrService.java
  2. … 36 more files in changeset.
Wednesday 11 May 2016
4:10 pm

Marcin Cieslak

LDEV-3776: Remove $Id CVS keyword.

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrSessionDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrSessionDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/Pixlr.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/PixlrSession.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/PixlrUser.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/service/IPixlrService.java
  16. … 990 more files in changeset.
3:38 pm

Marcin Cieslak

LDEV-3776: Remove $Id CVS keyword.

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrSessionDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrSessionDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/Pixlr.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/PixlrSession.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/model/PixlrUser.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/service/IPixlrService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/service/PixlrImportContentVersionFilter.java
  16. … 1265 more files in changeset.
Thursday 05 May 2016
4:11 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrConfigItemDAO.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java
    • -8
    • +8
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrSessionDAO.java
    • -27
    • +26
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrUserDAO.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java
    • -6
    • +7
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java
    • -23
    • +26
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java
    • -42
    • +42
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java
    • -48
    • +48
    ./lamsfoundation/lams/tool/pixlr/dto/NotebookEntryDTO.java
    • -24
    • +23
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java
    • -73
    • +75
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrSessionDTO.java
    • -162
    • +160
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java
    • -39
    • +37
    ./lamsfoundation/lams/tool/pixlr/model/Pixlr.java
    • -4
    • +5
    ./lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.java
    • -200
    • +199
    ./lamsfoundation/lams/tool/pixlr/model/PixlrSession.java
  16. … 2106 more files in changeset.
4:11 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrConfigItemDAO.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrDAO.java
    • -8
    • +8
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrSessionDAO.java
    • -27
    • +26
    ./lamsfoundation/lams/tool/pixlr/dao/IPixlrUserDAO.java
    • -3
    • +6
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java
    • -4
    • +7
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java
    • -23
    • +26
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java
    • -42
    • +40
    ./lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java
    • -48
    • +48
    ./lamsfoundation/lams/tool/pixlr/dto/NotebookEntryDTO.java
    • -24
    • +23
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrDTO.java
    • -73
    • +75
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrSessionDTO.java
    • -162
    • +160
    ./lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java
    • -37
    • +35
    ./lamsfoundation/lams/tool/pixlr/model/Pixlr.java
    • -4
    • +5
    ./lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.java
    • -200
    • +199
    ./lamsfoundation/lams/tool/pixlr/model/PixlrSession.java
  16. … 1846 more files in changeset.
Thursday 28 Apr 2016
5:07 pm

Marcin Cieslak

LDEV-3401: Convert XDoclet annotations to empty comments.

Options
    • -20
    • +20
    ./lamsfoundation/lams/tool/pixlr/model/Pixlr.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.java
    • -12
    • +12
    ./lamsfoundation/lams/tool/pixlr/model/PixlrSession.java
    • -14
    • +14
    ./lamsfoundation/lams/tool/pixlr/model/PixlrUser.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/pixlr/web/actions/AdminAction.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java
    • -7
    • +7
    ./lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/AdminForm.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/LearningForm.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/pixlr/web/forms/MonitoringForm.java
  14. … 461 more files in changeset.