Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4836 Change authoring to accommodate importing questions from QB

    • -0
    • +28
    ./bootstrap-toggle.scss
    • -0
    • +394
    ./qb-question.scss
  1. … 73 more files in changeset.
Merge branch 'master' into develop

  1. … 2 more files in changeset.
LDEV-4829 Cosmetic button changes, Assessment questions not numbered

  1. … 6 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. … 93 more files in changeset.
Merge branch 'master' into develop

  1. … 2 more files in changeset.
LDEV-4829 Application Exercise functionality completed, can edit titles

  1. … 16 more files in changeset.
LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

  1. … 7 more files in changeset.
LDEV-4814 Update free-jqGrid to the latest 4.15.5 version

  1. … 1 more file in changeset.
LDEV-4805 Finally switch to using free-jqGrid

  1. … 27 more files in changeset.
LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

  1. … 33 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 43 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 41 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

    • -1
    • +188
    ./jquery.tablesorter.theme.bootstrap.css
  1. … 120 more files in changeset.
LDEV-4759 Improved styling for accordians

  1. … 4 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 49 more files in changeset.
LDEV-4759 Main page restyled.

  1. … 8 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

    • -14043
    • +8462
    ./material-kit.css
  1. … 79 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

  1. … 3 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 391 more files in changeset.
LDEV-4770 CKEditor's content use display:block instead of inline-block

Content in CKEditor is by default displayed using display: inline-block,

however, this CSS property doesn't get applied in real life. Which

creates a discrepancy between the way content displayed inside the

editor and later on outside of it.

LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 42 more files in changeset.
LDEV-4759 Main page functional

  1. … 35 more files in changeset.
LDEV-4759 Choice of colour schemes blue or purple

    • -0
    • +12490
    ./material-kit-blue-primary.css
  1. … 6 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 505 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 309 more files in changeset.
LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

    • -0
    • +188
    ./theme.bootstrap_4.css
  1. … 15 more files in changeset.
LDEV-4764 Labels use standard font-weight overriding Bootstrap change

LDEV-4760 Fixed spacing in authoring criteria entry panel

  1. … 32 more files in changeset.
LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

    • -0
    • +18066
    ./material-kit.css
    • -0
    • +338
    ./material-kit.css.map
    • -0
    • +20
    ./material-kit.min.css
  1. … 252 more files in changeset.
Merge ordered branching LDEV-4587 into develop

  1. … 22 more files in changeset.