Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Central war

  1. … 49 more files in changeset.
LDEV-4407 Remove obsolete methods

  1. … 2 more files in changeset.
LDEV-4407 Prepare lams_central to not being accessible from other modules

Split IAuthoringService into IAuthoringFullService and IAuthoringService

interfaces:

1. IAuthoringFullService is going to be used by lams_central only

2. IAuthoringService - by all other modules

  1. … 12 more files in changeset.
LDEV-4652 Validating the title as it becomes the design name

  1. … 3 more files in changeset.
LDEV-4440 Central *.java migration

    • -0
    • +137
    ./java/org/lamsfoundation/lams/web/FindUserLessonsController.java
  1. … 53 more files in changeset.
LDEV-4440 Central

  1. … 21 more files in changeset.
LDEV-4645 Add default lesson settings to integrated servers

  1. … 7 more files in changeset.
LDEV-4650 Add default, immutable outcome scale

  1. … 8 more files in changeset.
LDEV-4644 Display and edit outcome results in monitor gradebook

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

  1. … 100 more files in changeset.
LDEV-4440 Grade book

  1. … 4 more files in changeset.
LDEV-4644 Add OutcomeAutor tag for outcome mapping

  1. … 20 more files in changeset.
LDEV-4638 Option to turn on confidence levels for iRA tRA

  1. … 6 more files in changeset.
LDEV-4646 Introduce LoginServlet that will forward to login.jsp

It was added to be able to set locale for login.jsp. As

LocaleFilter doesn't get fired when login.jsp is requested.

    • -0
    • +34
    ./java/org/lamsfoundation/lams/web/LoginServlet.java
  1. … 1 more file in changeset.
LDEV-4644 Add scale management

  1. … 16 more files in changeset.
LDEV-4644 Global outcomes management via sysadmin

  1. … 4 more files in changeset.
LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

  1. … 13 more files in changeset.
LDEV-4644 Add/edit learning outcome

  1. … 11 more files in changeset.
LDEV-4644 Add outcomes in More Options on index page

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

  1. … 17 more files in changeset.
LDEV-4636 Initial implementation of read-only LDs feature

  1. … 6 more files in changeset.
LDEV-4617 Do not put HTML tags into i18n labels

  1. … 1 more file in changeset.
LDEV-4617 i18n of signup emails

  1. … 1 more file 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. … 7 more files in changeset.
LDEV-4627 Set country and locale for users created via integrations

New locale detecting algorithm:

1. Check whether we have exactly the same locale. If we do - select it.

2. Grab the first two letters of the provided locale (which we assume to

be the language code), and map it to one of our locales of the

respective language. If we have multiple ones - choose the first one

from the list indiscriminately.

3. If we don't have locale of such language - use the server default

one.

  1. … 4 more files in changeset.
LDEV-4627 Courses doesn't have specific locale any longer

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. … 26 more files in changeset.
LDEV-4617 Implement full email verification on sign up

  1. … 9 more files in changeset.
LDEV-4627 Fix the issue of not passing "lang" parameter

There was an exception thrown on accessing LoginRequest with

missing lang parameter (i.e. URL doesn't contain lang parameter at all)