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
    • +3
    ./language/lams/ApplicationResources.properties
  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

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

    • -1
    • +4
    ./language/lams/ApplicationResources.properties
  1. … 118 more files in changeset.
LDEV-4609 Export previous lesson attempts

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4609 Remove "restart date" column of previous attempts in gradebook

    • -1
    • +0
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4440 Show archived activity attempts in gradebook

    • -1
    • +3
    ./language/lams/ApplicationResources.properties
  1. … 9 more files in changeset.
Revert "LDEV_NTU-10 Add a column "LAMS group" in exported summary"

This reverts commit 502290bd52d375ca2661924f6c80ff5590e5aaaf.

    • -1
    • +0
    ./language/lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV_NTU-10 Add a column "LAMS group" in exported summary

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 1 more file 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

    • -5
    • +5
    ./language/lams/ApplicationResources.properties
    • -5
    • +5
    ./language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 46 more files in changeset.
LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

    • -3
    • +3
    ./language/lams/ApplicationResources_el_GR.properties
    • -3
    • +8
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 37 more files in changeset.
LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

    • -2
    • +12
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 8 more files in changeset.
LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

    • -4
    • +4
    ./language/lams/ApplicationResources.properties
    • -2
    • +5
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 54 more files in changeset.
LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

  1. … 55 more files in changeset.
LDEV-4481 Add full implementation of min/max time taken.

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-4054: Updating Greek

    • -2
    • +4
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4449: adding label

    • -4
    • +5
    ./language/lams/ApplicationResources.properties
    • -2
    • +5
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-4449 Course gradebook exports include weighting

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-4054: Updating Greek

Updating greek

    • -2
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 15 more files in changeset.
LDEV-4054: Updating translations

Updating English and Spanish for various projects

    • -4
    • +8
    ./language/lams/ApplicationResources.properties
    • -2
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
    • -2
    • +11
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 4 more files in changeset.
LDEV-4054: Updating translations

Updating Greek

    • -2
    • +3
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

    • -4
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4433: adding new label

    • -2
    • +3
    ./language/lams/ApplicationResources.properties
    • -2
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 2 more files in changeset.
LDEV-4415 Gradebook calculations and UI support weighting

    • -1
    • +4
    ./language/lams/ApplicationResources.properties
  1. … 16 more files in changeset.
LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

    • -9
    • +10
    ./language/lams/ApplicationResources.properties
    • -2
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
    • -4
    • +8
    ./language/lams/ApplicationResources_en_AU.properties
    • -18
    • +29
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 49 more files in changeset.
LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart. Both the standalone Gradebook window (using the original call) and an "in tabs" version are supported by the existing jsp. Tweaked buttons in Course screen to match the buttons in the standalone Lesson screen.

    • -0
    • +4
    ./language/lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4054: Updating Greek

    • -6
    • +4
    ./language/lams/ApplicationResources_el_GR.properties
  1. … 18 more files in changeset.
LDEV-4275: Creating a simplified version of gradebook export. Added support for central alignment in an excel spreadsheet as well as another border style.

    • -4
    • +3
    ./language/lams/ApplicationResources.properties
    • -2
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
LDEV-3962 changing labels

    • -6
    • +4
    ./language/lams/ApplicationResources.properties
    • -4
    • +4
    ./language/lams/ApplicationResources_en_AU.properties
    • -6
    • +4
    ./language/lams/ApplicationResources_es_ES.properties
LDEV-3962 * readjusted Gradebook buttons' CSS and click handlers * fixed overlay CSS so it starts blocking entire area

    • -4
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.