• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
file LessonComparator.java was initially added on branch lams2_3_release.

    • -0
    • +0
    ./lams/gradebook/util/LessonComparator.java
LDEV-2706 Changes for Group and subgroup Gradebook excel export requested by NPS

*merge from lams2_3_release

    • -76
    • +143
    ./lams/gradebook/service/GradebookService.java
LDEV-2706 Changes for Group and subgroup Gradebook excel export requested by NPS

    • -78
    • +142
    ./lams/gradebook/service/GradebookService.java
LDEV-2700 Lesson summary to include the progress column

*merge from lams2_3_release

    • -20
    • +31
    ./lams/gradebook/service/GradebookService.java
LDEV-2700 Lesson summary to include the progress column

    • -16
    • +27
    ./lams/gradebook/service/GradebookService.java
LDEV-2697 Instead of attempted, name the activity that the student is at

*merge from lams2_3_release

    • -1
    • +10
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -21
    • +46
    ./lams/gradebook/service/GradebookService.java
  1. … 1 more file in changeset.
LDEV-2695 Excel export: Split firstname and lastname into two separate cells

*merge from HEAD

    • -13
    • +15
    ./lams/gradebook/service/GradebookService.java
LDEV-2697 Instead of attempted, name the activity that the student is at

    • -2
    • +10
    ./lams/gradebook/dto/GBUserGridRowDTO.java
  1. … 1 more file in changeset.
LDEV-2696 Course excel export disable multiple downloads

*merge from lams2_3_release

  1. … 3 more files in changeset.
LDEV-2696 Course excel export disable multiple downloads

  1. … 3 more files in changeset.
LDEV-2695 Excel export: Split firstname and lastname into two separate cells

*merge from HEAD

    • -2
    • +22
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -20
    • +28
    ./lams/gradebook/service/GradebookService.java
  1. … 1 more file in changeset.
LDEV-2695 Excel export: Split firstname and lastname into two separate cells

    • -1
    • +20
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -31
    • +41
    ./lams/gradebook/service/GradebookService.java
  1. … 1 more file in changeset.
LDEV-2597 added Ability to export course gradebook into excel

*merge from lams2_3_release

    • -1
    • +10
    ./lams/gradebook/service/IGradebookService.java
  1. … 1 more file in changeset.
LDEV-2597 added Ability to export course gradebook into excel

    • -1
    • +10
    ./lams/gradebook/service/IGradebookService.java
  1. … 1 more file in changeset.
SIF-10 Adding date to lesson for release date of marks. So it can be used for sif publisher

  1. … 3 more files in changeset.
LDEV-2386 Merging with 2.3 release branch

LDEV-2386 Fixing null pointer problem with gradebook caused by pre 2.3 lessons having their gradebook exported

merge lams2_3 to head

    • -6
    • +14
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -4
    • +8
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +4
    ./lams/gradebook/util/GradebookConstants.java
  1. … 19 more files in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

    • -75
    • +68
    ./lams/gradebook/service/GradebookService.java
  1. … 85 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

    • -9
    • +8
    ./lams/gradebook/dto/GradebookGridRowDTO.java
  1. … 214 more files in changeset.
Merge lams2_3 into head

    • -0
    • +54
    ./lams/gradebook/dto/ExcelCell.java
    • -32
    • +99
    ./lams/gradebook/dto/GradebookGridRowDTO.java
    • -33
    • +401
    ./lams/gradebook/service/GradebookService.java
    • -2
    • +84
    ./lams/gradebook/service/IGradebookService.java
    • -4
    • +106
    ./lams/gradebook/util/GradebookUtil.java
  1. … 156 more files in changeset.
Merge lams2_3_jboss5 changes into lams2_3

  1. … 99 more files in changeset.
removing redundant call in GradebookMonitoringAction

LDEV-2367Adding export to .xls file to gradebook

    • -0
    • +54
    ./lams/gradebook/dto/ExcelCell.java
    • -3
    • +19
    ./lams/gradebook/dto/GradebookGridRowDTO.java
    • -8
    • +230
    ./lams/gradebook/service/GradebookService.java
    • -1
    • +30
    ./lams/gradebook/service/IGradebookService.java
    • -4
    • +106
    ./lams/gradebook/util/GradebookUtil.java
  1. … 3 more files in changeset.
file ExcelCell.java was initially added on branch lams2_3.

    • -0
    • +0
    ./lams/gradebook/dto/ExcelCell.java
LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

  1. … 10 more files in changeset.
LDEV-2261 Setting a flag in gradebook activities so that they can be updated more than once if hte request comes from an external source like a tool. If it is set in gradebook, the flag is set so it cant be updated from an external source again

  1. … 8 more files in changeset.
Making average only print out to 2 dec places in gradebook

    • -50
    • +61
    ./lams/gradebook/dto/GradebookGridRowDTO.java
LDEV-2208 Prettying up gradebook css

LDEV-2220 gradebook changes suggested by james

  1. … 5 more files in changeset.
LDEV-2206 Adding auto filling functionaility for submit tool, also fixing submit tool so it only sends marks to gradebook when you release them - once

  1. … 6 more files in changeset.