Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4452 Prompt on overwriting unsaved changes in Authoring

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 2 more files in changeset.
Merge branch 'LDEV-4366'

    • -0
    • +5
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

  1. … 15 more files in changeset.
LDEV-4054: Updating translations

Updating English and Spanish for various projects

    • -9
    • +9
    ./language/lams/ApplicationResources.properties
    • -2
    • +9
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 5 more files in changeset.
Merge branch 'LDEV-4415' Marks can now be weighted

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

Updating Greek and English

    • -4
    • +5
    ./language/lams/ApplicationResources.properties
    • -6
    • +7
    ./language/lams/ApplicationResources_el_GR.properties
    • -5
    • +4
    ./language/lams/ApplicationResources_en_AU.properties
Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4415 Add a title to weights dialog

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/master' into LDEV-4415

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4427 System Admin can delete profile pictures

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-4415 Add front end for weighted outputs

    • -0
    • +6
    ./language/lams/ApplicationResources.properties
  1. … 14 more files in changeset.
LDEV-4395: Portrait will not tile and improved Generic spacing

  1. … 1 more file in changeset.
LDEV-4366 Portrait picture tweaks

  1. … 1 more file in changeset.
LDEV-4395 Tweaks to CSS and layouts for main page and portraits

Also deleted LESS files that are no longer needed

  1. … 6 more files in changeset.
LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

  1. … 51 more files in changeset.
LDEV-4380 Replace portrait capturing Flash widget with WebRTC

In order to completely eradicate Flash, we can use WebRTC which seems to

be working OK in newer browsers.

    • -0
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
LDEV-4390 Purple Theme

    • -0
    • +91
    ./scss/_lams_variables_purple.scss
  1. … 9 more files in changeset.
LDEV-4366 Introduce rubrics to Kumalive

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 28 more files in changeset.
LDEV-4054: updating labels

English, Greek and Norwegian

    • -33
    • +2
    ./language/lams/ApplicationResources.properties
    • -33
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
    • -33
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
    • -35
    • +4
    ./language/lams/ApplicationResources_no_NO.properties
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

    • -0
    • +840
    ./scss/_bootstrap-variables.scss
    • -0
    • +79
    ./scss/_lams_variables.scss
    • -0
    • +109
    ./scss/_mixins.scss
  1. … 154 more files in changeset.
LDEV-4366 Make Kumalive responsive and SASSy

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

Mainly Norwegian, Greek and English

    • -3
    • +3
    ./language/lams/ApplicationResources.properties
    • -2
    • +4
    ./language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
    • -45
    • +355
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 49 more files in changeset.
LDEV-4366 Add a working version of Kumalive

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 14 more files in changeset.
LDEV-4366 Prototype Kumalive front and back ends

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

    • -3
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4341: adding labels from i18n

    • -3
    • +8
    ./language/lams/ApplicationResources.properties
    • -5
    • +4
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-4341 1) Add advanced settings that will contain Save button 2) If there are *no* course groupings - jump directly to the create groups page

    • -0
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-4341 Ability to save lesson grouping as a course grouping

    • -0
    • +4
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-4337: Use proper spacing when pasting a copied activity.

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-3962 Replacing favicon