lams_tool_laqa

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4407 Other projects stop depending on lams_central

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

  1. … 17 more files in changeset.
LDEV-4644 Add missing jQuery UI CSS

    • -1
    • +1
    ./web/authoring/AuthoringTabsHolder.jsp
  1. … 2 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. … 102 more files in changeset.
LDEV-4644 Add outcomes in authoring in all tools

    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 115 more files in changeset.
LDEV-4440 JSON fix

  1. … 7 more files in changeset.
LDEV-4440 Scratchie autosave fix

  1. … 62 more files in changeset.
LDEV-4440 Scratchie authoring reflections fix

  1. … 14 more files in changeset.
LDEV-4440 Q&A autosave fix

  1. … 13 more files in changeset.
LDEV-4440 Scribe fixes

    • -1
    • +1
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./web/learning/RevisitedLearnerRep.jsp
  1. … 3 more files in changeset.
LDEV-4440 Pixlr fixes

  1. … 6 more files in changeset.
LDEV-4440 Scribe tool

  1. … 47 more files in changeset.
LDEV-4440 Q&A & pixlr minor fixes

  1. … 1 more file in changeset.
LDEV-4440 Pixlr nostruts library

  1. … 42 more files in changeset.
LDEV-4440 Q&A nostruts library

    • -212
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic.tld
    • -3171
    • +0
    ./web/WEB-INF/tlds/struts/struts-nested.tld
  1. … 5 more files in changeset.
LDEV-4440 Pixlr fixes

  1. … 37 more files in changeset.
LDEV-4440 Q&A learning

    • -2
    • +2
    ./web/learning/RevisitedLearnerRep.jsp
  1. … 4 more files in changeset.
LDEV-4440 Q&A minor fixes

    • -1
    • +1
    ./web/learning/RevisitedLearnerRep.jsp
  1. … 1 more file in changeset.
LDEV-4440 Pixlr & Q&A fixes

    • -3
    • +3
    ./web/learning/RevisitedLearnerRep.jsp
  1. … 44 more files in changeset.
LDEV-4440 Q&A learning & monitoring fixes

    • -2
    • +2
    ./web/monitoring/MonitoringMaincontent.jsp
LDEV-4440 Q&A fixes

    • -4
    • +1
    ./web/authoring/AuthoringTabsHolder.jsp
    • -1
    • +1
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -0
    • +1
    ./web/learning/CombinedAnswersContent.jsp
    • -221
    • +205
    ./web/learning/LearnerRep.jsp
    • -9
    • +8
    ./web/learning/RevisitedLearnerRep.jsp
  1. … 4 more files in changeset.
LDEV-4440 Q&A authoring and learning fixes

    • -2
    • +2
    ./web/authoring/AuthoringTabsHolder.jsp
    • -3
    • +3
    ./web/learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
LDEV-4440 Shared resources monitoring fixes

  1. … 2 more files in changeset.
LDEV-4440 Shared resource authoring & Q&A

    • -5
    • +4
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -31
    • +31
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 9 more files in changeset.
LDEV-4440 Shared resources minor fixes

  1. … 3 more files in changeset.
LDEV-4440 Mysql patch

LDEV-4440 Q&A authoring

    • -2
    • +1
    ./web/authoring/AuthoringTabsHolder.jsp
LDEV-4440 Shared resources udate

  1. … 1 more file in changeset.
LDEV-4440 Share resource - work in progress, almost finished authoring

  1. … 7 more files in changeset.
LDEV-4440 Sared resources - authoring - work in progress

    • -52
    • +39
    ./web/WEB-INF/tags/TextSearch.tag
    • -20
    • +19
    ./web/authoring/AdvancedContent.jsp
    • -21
    • +21
    ./web/authoring/AuthoringTabsHolder.jsp
    • -37
    • +33
    ./web/authoring/addCondition.jsp
    • -15
    • +14
    ./web/authoring/newQuestionBox.jsp
  1. … 19 more files in changeset.