Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5298' into LDEV-5314

    • -0
    • +1
    ./lams/ApplicationResources.properties
LDEV-5298 Make label for Upload Complete more clear

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
LDEV-4769 Updating Chinese Traditional

    • -19
    • +19
    ./lams/ApplicationResources_zh_CN.properties
  1. … 28 more files in changeset.
LDEV-4769 Updating Chinese Traditional

    • -148
    • +171
    ./lams/ApplicationResources_zh_CN.properties
  1. … 8 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek, Spanish, Chinese Traditional

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 41 more files in changeset.
LDEV-5298 Put upload form on top and uploaded file below

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5298 Improve Uppy and Submit Files UI

Uppy font globally is smaller.

In Submit Files the upload area is thinner and has a distinct

background. The upload button matches its colour.

Fix Uppy language detection in Submit Files.

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 16 more files in changeset.
LDEV-5298 Make Add button more obvious

    • -1
    • +2
    ./lams/ApplicationResources.properties
    • -1
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4769 Updating English, Norwegian, Greek, Spanish

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 6 more files in changeset.
LDEV-5119 Add manual grading output to Submit Files tool

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating Norwegian

    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 6 more files in changeset.
LDEV-4769 Updating Norwegian, Spanish, Greek, Chinese Simplified and English

    • -0
    • +2
    ./lams/ApplicationResources_no_NO.properties
  1. … 15 more files in changeset.
LDEV-4769 Updating Simplified Chinese, English, Spanish, Greek, Norwegian

    • -3
    • +2
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 24 more files in changeset.
LDEV-5232 Remove "notify student" option from Submit Files authoring

Add a button in monitoring for teacher to notify learners on marks

release.

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 11 more files in changeset.
LDEV-5229 Make previous changes to tools consistent

    • -5
    • +6
    ./lams/ApplicationResources.properties
  1. … 31 more files in changeset.
LDEV-5229 Authoring popovers for submit files

    • -3
    • +7
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5215 Double scape the label for now

For now, I'm just fixing the label, but this is probably better if we handle this programmatically some how as it might crop up in a different place later.

    • -1
    • +1
    ./lams/ApplicationResources_fr_FR.properties
LDEV-4769 Updating Greek, French, English, Spanish, Norwegian

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 8 more files in changeset.
LDEV-4769 Updating Greek, French

    • -0
    • +5
    ./lams/ApplicationResources_fr_FR.properties
  1. … 7 more files in changeset.
LDEV-4769 Update Spanish, English, Greek and Norwegian

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 12 more files in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek

    • -1
    • +0
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 23 more files in changeset.
LDEV-5186 Make file upload email consistent among tools

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 80 more files in changeset.
LDEV-4769 Updating English, Norwegian and Greek

    • -0
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_no_NO.properties
  1. … 25 more files in changeset.
LDEV-5143 labels

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 19 more files in changeset.
Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 11 more files in changeset.
LDEV-5143 and LDEV-5140 labels updates

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 20 more files in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek, German, French

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 22 more files in changeset.
LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 33 more files in changeset.
LDEV-4769 Updating Greek

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 9 more files in changeset.