Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Update mark fixed

LDEV-4440 Finished migration of SubmitFiles

  1. … 2 more files in changeset.
LDEV-4440 Minor changes in error handling

  1. … 2 more files in changeset.
LDEV-4440 Tweak file validators to return correct messages

  1. … 3 more files in changeset.
LDEV-4440 Rewrite validation in PedPlanner forms

  1. … 8 more files in changeset.
LDEV-4440 SubmitFiles - new paths at learning

  1. … 3 more files in changeset.
LDEV-4440 SubmitFiles migration in progress

  1. … 2 more files in changeset.
LDEV-4440 new paths at sbmt tool

  1. … 12 more files in changeset.
LDEV-4440 Sbmt - authoring migration

  1. … 1 more file in changeset.
LDEV-4440 update Page.tag and TextSearch.tag

  1. … 4 more files in changeset.
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

  1. … 25 more files in changeset.
LDEV-4440 Submit Files after migration to Spring - no Struts

  1. … 29 more files in changeset.
LDEV-4440 Almost finished migration of Submit Files

  1. … 6 more files in changeset.
LDEV-4440 Migration of Submit Files in progress

  1. … 4 more files in changeset.
LDEV-4440 Migration of sbmt in progress

  1. … 5 more files in changeset.
LDEV-4440 Started Sbmt migration

  1. … 33 more files in changeset.
LDEV-4620 Include tool name to a log event description

LDEV-4620 Submit Files tool to log release marks event

  1. … 6 more files in changeset.
LDEV-4611 minor changes to release marks feature

* Slightly modify CSS of release mark alert message

* Don't display old message at the top of a page on releasing marks

  1. … 1 more file in changeset.
LDEV-4611 Release marks auto pushes marks to gradebook now

Release marks needs to be a "state" within the tool rather than

something that is transient. If this option is marks are already

released, then marks entered in SF monitor should be auto pushed to

monitor and disclosed to students via SF learner.

Also once you release marks you should not be able to unrelease them.

View all marks page should also state the release marks state.

  1. … 8 more files in changeset.
LDEV-4611 Code clean up

  1. … 1 more file in changeset.
LDEV-4558 Rename dbupdate files as name is a month out.

  1. … 38 more files in changeset.
LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

  1. … 28 more files in changeset.
Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.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/web/SessionListener.java

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

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

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

  1. … 19 more files in changeset.
LDEV-4549 Refreshing learner screen no longer duplicates files.

  1. … 3 more files in changeset.
LDEV-4541 Submit activity can be edited after learner starts

  1. … 1 more file in changeset.
Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

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

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  1. … 82 more files in changeset.
LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

  1. … 34 more files in changeset.
LDEV-4523 Tools remove mark rather than clear it on user content delete

  1. … 4 more files in changeset.
LDEV-4501 All Audit Log entries are now Log Event entries

  1. … 65 more files in changeset.