Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4649 Scale import

  1. … 5 more files in changeset.
LDEV-4440 updated sql - monitoring rows

    • -0
    • +32
    ./lamsfoundation/lams/dbupdates/patch20180827.sql
  1. … 1 more file in changeset.
LDEV-4440 Central noStruts Library

  1. … 13 more files in changeset.
LDEV-4440 Central migration

  1. … 52 more files in changeset.
Merge branch 'LDEV-4407'

  1. … 4 more files in changeset.
LDEV-4407 Move contentrepository specific code to lams_contentrepository

Split IToolContentHandler into IToolContentFullHandler and

IToolContentHandler interfaces

1. IToolContentFullHandler is going to be used by lams_contentrepository

only

2. IToolContentHandler - by all other modules

  1. … 5 more files in changeset.
LDEV-4649 Outcome export

  1. … 5 more files in changeset.
LDEV-4649 Outcome scale export

    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
  1. … 5 more files in changeset.
LDEV-4407 Other projects stop depending on lams_central

    • -0
    • +24
    ./lamsfoundation/lams/util/CommonConstants.java
    • -2
    • +1
    ./lamsfoundation/lams/util/UploadFileUtil.java
  1. … 100 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

    • -0
    • +72
    ./lamsfoundation/lams/authoring/IAuthoringService.java
    • -0
    • +67
    ./lamsfoundation/lams/rest/RestTags.java
    • -0
    • +31
    ./lamsfoundation/lams/rest/ToolRestManager.java
    • -0
    • +39
    ./lamsfoundation/lams/util/SMTPAuthenticator.java
    • -0
    • +905
    ./lamsfoundation/lams/util/imgscalr/CircularByteBuffer.java
    • -0
    • +195
    ./lamsfoundation/lams/web/action/LamsAuthoringFinishAction.java
    • -0
    • +100
    ./lamsfoundation/lams/web/form/TextSearchActionForm.java
  1. … 20 more files in changeset.
LDEV-4609 Fix archived attempt ordering

LDEV-4647 Images in QTI export/import questions feature support width/length/class attributes

    • -14
    • +35
    ./lamsfoundation/lams/questions/QuestionParser.java
LDEV-4645 Add default lesson settings to integrated servers

    • -0
    • +21
    ./lamsfoundation/lams/dbupdates/patch20180821.sql
  1. … 7 more files in changeset.
LDEV-4440 Grouping fixes

  1. … 11 more files in changeset.
LDEV-4440 Gradebook toogleMarks

    • -0
    • +0
    ./lamsfoundation/lams/dbupdates/patch20180821.sql
  1. … 17 more files in changeset.
LDEV-4650 Add default, immutable outcome scale

    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
  1. … 5 more files in changeset.
LDEV-4407 move gradebook classes to lams_gradebook

    • -5
    • +0
    ./lamsfoundation/lams/commonContext.xml
  1. … 4 more files in changeset.
LDEV-4440 Learning minor fixes

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

    • -0
    • +5
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
  1. … 15 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

    • -8
    • +32
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +118
    ./lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java
    • -1
    • +1
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +20
    ./lamsfoundation/lams/util/CommonConstants.java
  1. … 91 more files in changeset.
LDEV-4644 Add OutcomeAutor tag for outcome mapping

    • -3
    • +6
    ./lamsfoundation/lams/outcome/Outcome.java
    • -0
    • +54
    ./lamsfoundation/lams/outcome/OutcomeMapping.java
    • -0
    • +65
    ./lamsfoundation/lams/outcome/OutcomeResult.java
    • -0
    • +8
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
  1. … 11 more files in changeset.
DEMO-1 Add getMessage() method that accepts custom locale

    • -1
    • +20
    ./lamsfoundation/lams/util/MessageService.java
  1. … 1 more file in changeset.
LDEV-4646 Change priority of preferred locale setting

The priority of choosing preferred locale will be the following:

1. user's setting from database (the highest priority)

2. client's browser locale

3. server default locale

    • -1
    • +12
    ./lamsfoundation/lams/util/LanguageUtil.java
LDEV-4644 Add scale management

    • -4
    • +25
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -0
    • +3
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
  1. … 13 more files in changeset.
LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

    • -1
    • +27
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +9
    ./lamsfoundation/lams/outcome/Outcome.java
    • -0
    • +5
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +11
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -0
    • +24
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  1. … 7 more files in changeset.
LDEV-4644 Add/edit learning outcome

    • -0
    • +29
    ./lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +31
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
  1. … 12 more files in changeset.
LDEV-4644 Add outcomes model

    • -0
    • +49
    ./lamsfoundation/lams/dbupdates/patch20180802.sql
    • -0
    • +81
    ./lamsfoundation/lams/outcome/Outcome.java
    • -0
    • +84
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -0
    • +41
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.java
  1. … 4 more files in changeset.
LDEV-4440 Add missing no-arg constructors

They are required by LD import in authoring.

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.

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180731.sql
  1. … 14 more files in changeset.
LDEV-4641 Allow STARTTLS and SSL when sending emails with SMTP

    • -0
    • +16
    ./lamsfoundation/lams/dbupdates/patch20180730.sql
    • -1
    • +9
    ./lamsfoundation/lams/util/Emailer.java
  1. … 3 more files in changeset.