Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Secure setting submission deadline with CSRF Guard

  1. … 63 more files in changeset.
Merge branch 'master' into LDEV-4886

  1. … 1 more file in changeset.
LDEV-4880 Correctly check whether variable is undefined

    • -1
    • +1
    ./jquery.jqGrid.confidence-level-formattter.js
Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

  1. … 35 more files in changeset.
LDEV-4918 Collapsible subcourses

  1. … 13 more files in changeset.
LDEV-4898 Fix race condition when generating a LD SVG

  1. … 1 more file in changeset.
LDEV-4771 Re-introduce multiple activity authoring dialogs

  1. … 1 more file in changeset.
LDEV-4880 Add confidence level variations

    • -6
    • +43
    ./jquery.jqGrid.confidence-level-formattter.js
  1. … 19 more files in changeset.
LDEV-4911 Create structure for monitoring learning

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

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

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

    • -3241
    • +3299
    ./authoring/authoringGeneral.js
    • -1957
    • +1938
    ./authoring/authoringProperty.js
  1. … 5 more files in changeset.
LDEV-4909 Validate groupings and input on LD save

    • -3239
    • +3297
    ./authoring/authoringGeneral.js
  1. … 2 more files in changeset.
LDEV-4909 Allow any grouping in any activity

Validation will be done before LD save

    • -1929
    • +1910
    ./authoring/authoringProperty.js
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_central/web/includes/javascript/authoring/authoringActivity.js

  1. … 1 more file in changeset.
LDEV-4887 Adding id, classes to make automated testing faster

  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

LDEV-4898 Fix race condition when generating a LD SVG

LDEV-4893 Current activity opens in a pop up in monitor progress bar

LDEV-4879 Create lesson in subgroups at one go

  1. … 4 more files in changeset.
LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

    • -0
    • +12
    ./bootstrap-tourist.min.js
  1. … 7 more files in changeset.
LDEV-4877 Upgrade bootstrap library to version 3.4.1

* bootstrap-slider to 10.6.2

* bootstrap-tour to 0.12.0

  1. … 3 more files in changeset.
LKC-221 Rearrange and regenerate LD SVG after activities were modified

LDEV-4875 Add VSA question type to Assessment and Scratchie

  1. … 75 more files in changeset.
LDEV-4871 Fix query string building when requesting a print page

LDEV-4853 Add info that treeview library has been customised for LAMS

LDEV-4853 Fix a minor issue with empty folder display

LDEV-4853 Make locks on read-only folders red.

  1. … 1 more file in changeset.
LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

  1. … 1 more file in changeset.
LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

  1. … 22 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

    • -3241
    • +3204
    ./authoring/authoringGeneral.js
    • -0
    • +1425
    ./bootstrap-treeview.js
    • -0
    • +145
    ./learning-design-treeview.js
  1. … 3 more files in changeset.
LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

  1. … 13 more files in changeset.