Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5287 Always use https to get embedded content

Merge remote-tracking branch 'origin/LDEV-5287' into v4.6

Conflicts:

lams_tool_assessment/web/pages/learning/learning.jsp

    • -110
    • +175
    ./pages/learning/learning.jsp
LDEV-5287 Add preview to Add URL box in learning

LDEV-5287 Cosmetic changes

Remove no-gutter from comments. Improved finished icon in SR

  1. … 1 more file in changeset.
LDEV-5287 Allow multiple collapsible Comment tags on a single page

If one folded panel gets expanded, all other ones get collapsed and

emptied.

  1. … 32 more files in changeset.
LDEV-5287 Add preview to Add URL box in learning

LDEV-5287 No need to manually set embedded iframe height anymore

LDEV-5287 Improve "open in new window" link and icon layout

LDEV-5287 Fix preview in authoring

LDEV-5287 Cosmetic changes

    • -18
    • +17
    ./pages/itemreview/itemContent.jsp
LDEV-5287 Fix Open in New Window button

LDEV-5287 Show ratings and comments in author preview mode

    • -10
    • +12
    ./pages/itemreview/itemContent.jsp
  1. … 2 more files in changeset.
LDEV-5287 Put preview into a panel

    • -11
    • +13
    ./pages/authoring/parts/addurl.jsp
LDEV-5287 Put URL form field above Title.

LDEV-5287 Fill blank item title with embedded content title on fetch

LDEV-5290 Prevent multiple tabs from being open on autosave

  1. … 40 more files in changeset.
LDEV-5287 Use JS function for URL encoding instead of back end

    • -16
    • +13
    ./pages/itemreview/itemContent.jsp
  1. … 2 more files in changeset.
LDEV-5287 Use icon for preview button in Share Resources authoring

LDEV-5287 Add preview to Add URL page in Share Resources authoring

    • -0
    • +33
    ./includes/javascript/rsrcembed.js
LDEV-5287 Display Finish button on completing enough items

  1. … 1 more file in changeset.
LDEV-5287 Improve "preview" buttons in authoring

  1. … 2 more files in changeset.
LDEV-5287 Remove "run auto" feature

    • -17
    • +0
    ./pages/monitoring/advanceoptions.jsp
  1. … 5 more files in changeset.
LDEV-5287 Add missing CKEditor init parameter

  1. … 32 more files in changeset.
LDEV-5287 Allow multiple comments tags on a single page

  1. … 32 more files in changeset.
LDEV-5287 Display all shared resources on single page with panels

    • -120
    • +0
    ./pages/itemreview/instructionsnav.jsp
    • -0
    • +101
    ./pages/itemreview/itemContent.jsp
    • -94
    • +29
    ./pages/itemreview/mainframe.jsp
    • -110
    • +172
    ./pages/learning/learning.jsp
  1. … 5 more files in changeset.
LDEV-5287 Remove zipped website and learning object as item types

No one is using them anymore. URLs and files should be enough.

    • -107
    • +0
    ./pages/authoring/parts/addlearningobject.jsp
    • -113
    • +0
    ./pages/authoring/parts/addwebsite.jsp
    • -39
    • +14
    ./pages/authoring/parts/itemlist.jsp
    • -31
    • +0
    ./pages/learningobj/defaultcontent.jsp
    • binary
    ./pages/learningobj/icons/empty.gif
    • binary
    ./pages/learningobj/icons/folder.gif
    • binary
    ./pages/learningobj/icons/folderopen.gif
    • binary
    ./pages/learningobj/icons/joinbottom.gif
    • binary
    ./pages/learningobj/icons/minus.gif
    • binary
    ./pages/learningobj/icons/minusbottom.gif
  1. … 20 more files in changeset.
LDEV-5287 Remove multiple instructions per each item

Now each item has got only one rich text instructions field. It should

be quite sufficient.

    • -79
    • +6
    ./includes/javascript/rsrcresourceitem.js
    • -36
    • +35
    ./pages/authoring/parts/addfile.jsp
    • -32
    • +31
    ./pages/authoring/parts/addurl.jsp
    • -47
    • +0
    ./pages/authoring/parts/instructions.jsp
    • -28
    • +1
    ./pages/itemreview/instructionsnav.jsp
  1. … 11 more files in changeset.
LDEV-5287 Fix CSRF guard filter duplicate declaration

LDEV-5287 Remove "open in pop up" feature

    • -41
    • +73
    ./pages/itemreview/mainframe.jsp
  1. … 10 more files in changeset.
LDEV-5287 Use CKEditor's approach to display embedded content