Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

  1. … 11 more files in changeset.
LDEV-4440 Central war

    • -1
    • +1
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +31
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 36 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. … 26 more files in changeset.
LDEV-4652 Validating the title as it becomes the design name

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

  1. … 57 more files in changeset.
LDEV-4440 Central

    • -0
    • +17
    ./WEB-INF/spring-servlet.xml
    • -2
    • +2
    ./authoring/template/tool/assessmcq.jsp
    • -2
    • +2
    ./authoring/template/tool/mcquestion.jsp
  1. … 32 more files in changeset.
LDEV-4440 Learning noStruts library working

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

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

  1. … 6 more files in changeset.
LDEV-4440 Gradebook noStruts library

  1. … 24 more files in changeset.
LDEV-4440 Learning minor fixes

  1. … 6 more files in changeset.
LDEV-4639 Force the tour to start at the first screen everytime

LDEV-4644 Display and edit outcome results in monitor gradebook

    • -0
    • +19
    ./css/x-editable-lams.css
  1. … 18 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

    • -245
    • +216
    ./includes/javascript/openUrls.js
  1. … 102 more files in changeset.
LDEV-4644 Add outcomes in authoring in all tools

    • -0
    • +155
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 117 more files in changeset.
LDEV-4534 Add x-editable library that allows inline editing

    • -0
    • +663
    ./css/x-editable.css
    • binary
    ./images/css/clear.png
    • binary
    ./images/css/loading.gif
    • -0
    • +7
    ./includes/javascript/x-editable.js
LDEV-4638 Option to turn on confidence levels for iRA tRA

  1. … 8 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.

  1. … 1 more file in changeset.
LDEV-4644 Add scale management

    • -0
    • +115
    ./outcome/scaleEdit.jsp
    • -0
    • +99
    ./outcome/scaleManage.jsp
  1. … 10 more files in changeset.
LDEV-4216: increasing tour popup sides to fix all language strings

The popup max-width is rather small for the button labels in some languages. increase from 276px to 320 instead.

LDEV-4644 Global outcomes management via sysadmin

  1. … 3 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

    • -0
    • +23
    ./includes/javascript/outcome.js
    • -0
    • +128
    ./outcome/outcomeEdit.jsp
    • -0
    • +97
    ./outcome/outcomeManage.jsp
  1. … 7 more files 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. … 15 more files in changeset.
LDEV-4640, LDEV-4475 Do not make a chart bigger than available space

LDEV-4640 Fix chart legend if there are no participants

  1. … 1 more file in changeset.
LDEV-4636 Minor fixes in read-only feature

LDEV-4636 Use lock icon to depict read-only status

LDEV-4636 Initial implementation of read-only LDs feature

    • -24
    • +70
    ./includes/javascript/authoring/authoringGeneral.js
  1. … 3 more files in changeset.
LDEV-4617 Implement full email verification on sign up

    • -0
    • +37
    ./signup/emailVerify.jsp
    • -0
    • +45
    ./signup/emailVerifyResult.jsp
  1. … 7 more files in changeset.