Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4771 Re-introduce multiple activity authoring dialogs

  1. … 1 more file 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
    ./authoringGeneral.js
    • -1957
    • +1938
    ./authoringProperty.js
  1. … 5 more files in changeset.
LDEV-4909 Validate groupings and input on LD save

    • -3239
    • +3297
    ./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
    ./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.
LKC-221 Rearrange and regenerate LD SVG after activities were modified

LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

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

Initial YUI clean up.

Fix minor issues.

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

    • -3241
    • +3204
    ./authoringGeneral.js
  1. … 5 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

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

  1. … 2 more files in changeset.
LDEV-4792 Rewrite authoring spinners from jQuery UI to plain HTML 5

  1. … 1 more file in changeset.
Merge branch 'master' into develop

  1. … 1 more file in changeset.
LDEV-4797 Remove isGateActivityCompletionBased flag in case schedule gate doesn't have preceding activity

  1. … 1 more file in changeset.
LDEV-4787 Fix incorrect spacing when copying activities in authoring

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

LDEV-4780 Properly detect if authoring is in a frame

Merge remote-tracking branch 'origin/master' into develop

LDEV-4780 Use callbak to resize iframe instead of load detection

When iframe with LD for importing activities gets loaded, the SVG is not

ready yet and reports false height. Instead of detecting when it is

ready, authoring JS code in the iframe reports height when it loads

completely to its parent frame.

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

  1. … 25 more files in changeset.
LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

  1. … 25 more files in changeset.
LDEV-4772 Fix properties dialog position in authoring after first drag

LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

  1. … 17 more files in changeset.
Merge ordered branching LDEV-4587 into develop

  1. … 21 more files in changeset.
LDEV-4757 Fix group overwriting with same UIID

Groups' UIIDs were not taken into account when calculating max UIID for

opened LD. Sometimes an existing UIID got generated and it overwrote an

existing group.

Also adjust new group naming.

LDEV-4714 Fix a typo in arrange detection.

LDEV-4714 Make fetching output definitions async

For large LDs sync calls can noticeably slow down drawing process.

LDEV-4391 Prevent double clicking on Save As and Import buttons

Even though Save button in Save As dialog does not seem to get spinning

arrows, it gets disabled straight away and double submit does not

happen. The arrows never get a chance to get rendered as code

responsible for saving works quickly and calls reset() method on the

button.

  1. … 2 more files in changeset.
LDEV-4717 Fix LD renaming in authoring