lams_tool_notebook

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

  1. … 74 more files in changeset.
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.
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-4054: Updating labels

English, Spanish and Greek.

  1. … 19 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 Scribe tool

    • -2
    • +2
    ./web/pages/monitoring/daterestriction.jsp
  1. … 47 more files in changeset.
LDEV-4440 Rewrite validation in PedPlanner forms

  1. … 8 more files in changeset.
LDEV-4440 Notebook, corrected editActivity.jsp

    • -1
    • +2
    ./web/pages/monitoring/editActivity.jsp
LDEV-4440 Notebook revised

    • -10
    • +12
    ./web/pages/learning/notebook.jsp
  1. … 5 more files in changeset.
LDEV-4440 Corrected notebook with nostruts library

    • -39
    • +39
    ./web/pages/monitoring/summary.jsp
  1. … 9 more files in changeset.
LDEV-4440 Notebook with post method

    • -186
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
  1. … 2 more files in changeset.
LDEV-4440 Survey ready

  1. … 9 more files in changeset.
LDEV-4440 notebook 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
    • -343
    • +0
    ./web/WEB-INF/tlds/struts/struts-tiles-el.tld
    • -344
    • +0
    ./web/WEB-INF/tlds/struts/struts-tiles.tld
  1. … 5 more files in changeset.
LDEV-4440 switch survey to nostruts library

    • -5
    • +4
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -31
    • +30
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -10
    • +9
    ./web/WEB-INF/tags/CommentsAuthor.tag
  1. … 25 more files in changeset.
LDEV-4440 Necessary changes for migration to Spring - changes in method of validation

  1. … 8 more files in changeset.
LDEV-4440 Finished survey

  1. … 23 more files in changeset.
LDEV-4440 Changed TextSearch.tag

    • -52
    • +39
    ./web/WEB-INF/tags/TextSearch.tag
    • -1
    • +1
    ./web/pages/authoring/addCondition.jsp
LDEV-4440 Notebook learning tweaking

    • -1
    • +1
    ./web/pages/authoring/addCondition.jsp
  1. … 1 more file in changeset.
LDEV-4440 Notebook authoring

  1. … 6 more files in changeset.
LDEV-4440 Changing notebook

  1. … 22 more files in changeset.
LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

  1. … 48 more files in changeset.
LDEV-4054: Updating labels

  1. … 25 more files in changeset.
LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

  1. … 37 more files in changeset.
Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

  1. … 22 more files in changeset.
LDEV-4054: Updating missing labels and Greek

  1. … 13 more files in changeset.
LDEV-4559 Comments can be left anonymously.

    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  1. … 91 more files in changeset.
LDEV-4561 Edit notebook after learners have started activity.

Also fixed some bugs with the teachers comment field to ensure

emojis are displayed and to avoid injection issues.

    • -10
    • +8
    ./web/pages/monitoring/editActivity.jsp