lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4644 Display and edit outcome results in monitor gradebook

    • -0
    • +19
    /lams_central/web/css/x-editable-lams.css
  1. … 4 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
    /lams_central/web/includes/javascript/openUrls.js
  1. … 89 more files in changeset.
LDEV-4440 Grade book

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -2
    • +2
    /lams_gradebook/web/gradebookCourseLearner.jsp
LDEV-4440 Migration / changes at jsp files

    • -1
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
    • -18
    • +74
    /lams_admin/web/config/editconfig.jsp
    • -11
    • +14
    /lams_admin/web/config/items.jsp
    • -100
    • +210
    /lams_admin/web/import/importexcel.jsp
    • -86
    • +204
    /lams_admin/web/lti/ltiConsumer.jsp
    • -61
    • +169
    /lams_admin/web/lti/ltiConsumerList.jsp
    • -296
    • +546
    /lams_admin/web/organisation/list.jsp
    • -98
    • +224
    /lams_admin/web/servermaintain.jsp
  1. … 8 more files in changeset.
LDEV-4440 Learning server start

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -98
    • +118
    /lams_learning/web/branching/preview.jsp
    • -21
    • +38
    /lams_learning/web/branching/wait.jsp
    • -22
    • +53
    /lams_learning/web/gate/conditionGateContent.jsp
    • -22
    • +54
    /lams_learning/web/gate/permissionGateContent.jsp
    • -39
    • +71
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -11
    • +40
    /lams_learning/web/gate/synchGateContent.jsp
    • -82
    • +100
    /lams_learning/web/grouping/choose.jsp
    • -85
    • +105
    /lams_learning/web/grouping/show.jsp
    • -27
    • +38
    /lams_learning/web/grouping/wait.jsp
    • -171
    • +190
    /lams_learning/web/lessonComplete.jsp
  1. … 11 more files in changeset.
Merge from master to include x-editable

LDEV-4440 Actions changed to controllers

  1. … 67 more files in changeset.
LDEV-4644 Add outcomes in authoring in all tools

    • -0
    • +155
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +155
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +155
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +155
    /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +155
    /lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 104 more files in changeset.
LDEV-4440 Learning

  1. … 41 more files in changeset.
LDEV-4609 Export previous lesson attempts

LDEV-4609 Remove "restart date" column of previous attempts in gradebook

    • -4
    • +2
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4644 OutcomeAuthor tag layout adjustments

    • -17
    • +33
    /lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
Merge branch 'LDEV-4534'

LDEV-4534 Ability to rename lesson title

    • -0
    • +30
    /lams_monitoring/web/css/_monitorLesson_base.scss
LDEV-4534 Add x-editable library that allows inline editing

    • -0
    • +663
    /lams_central/web/css/x-editable.css
    • binary
    /lams_central/web/images/css/clear.png
    • binary
    /lams_central/web/images/css/loading.gif
    • -0
    • +7
    /lams_central/web/includes/javascript/x-editable.js
LDEV-4440 Started migration of admin - added spring-servlet, changed web.xml, new forms files

  1. … 96 more files in changeset.
LDEV-4440 Learning and Gradebook

    • -0
    • +17
    /lams_gradebook/web/WEB-INF/spring-servlet.xml
    • -6
    • +6
    /lams_gradebook/web/WEB-INF/tags/Page.tag
  1. … 50 more files in changeset.
LDEV-4440 Removed dispatch fields

LDEV-4440 Post methods added

LDEV-4644 Add OutcomeAutor tag for outcome mapping

  1. … 6 more files in changeset.
LDEV-4440 Fixed wiki

LDEV-4440 Changed returns at controllers

LDEV-4440 Fixed changePage method

    • -2
    • +0
    /lams_tool_wiki/web/pages/authoring/basic.jsp
LDEV-4440 No struts at Wiki

    • -188
    • +0
    /lams_tool_wiki/web/WEB-INF/struts-config.xml
    • -186
    • +0
    /lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
  1. … 15 more files in changeset.
LDEV-4440 Removed "method" attribute

    • -1
    • +0
    /lams_tool_nb/web/authoring/authoring.jsp
LDEV-4440 Doku edit activity fix

LDEV-4440 Wookie NoStruts

    • -0
    • +17
    /lams_tool_wookie/web/WEB-INF/spring-servlet.xml
    • -17
    • +0
    /lams_tool_wookie/web/WEB-INF/struts-config.xml
    • -15
    • +6
    /lams_tool_wookie/web/WEB-INF/web.xml
    • -0
    • +5
    /lams_tool_wookie/web/index.jsp
LDEV-4440 DOKU NoStruts

    • -171
    • +0
    /lams_tool_doku/web/WEB-INF/struts-config.xml
  1. … 6 more files in changeset.
LDEV-4440 Migration in progress

LDEV-4440 Kaltura noStruts

    • -217
    • +0
    /lams_tool_kaltura/web/WEB-INF/struts-config.xml
    • -103
    • +0
    /lams_tool_kaltura/web/WEB-INF/tiles-defs.xml
  1. … 4 more files in changeset.