lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-4400' into lams31

LDEV-4400 Update WF slimming process

LDEV-4400 Mark a Hibernate property as nullable

User's two step auth secret is null by default, but it was marked as

non-null.

LDEV-4400 Update configuration files to match latest schemas

    • -15
    • +25
    /lams_build/conf/slim/standalone.xml
    • -1
    • +1
    /lams_build/lib/apache-poi/poi.module.xml
  1. … 19 more files in changeset.
LDEV-4400 Update source code of WF10 embedded libraries

  1. … 4410 more files in changeset.
LDEV-4400 Update dependecies to embedded libraries

WildFly 10 is shipped with newer versions of libraries that LAMS uses.

LAMS now points to proper JAR files. Following libraries were updated:

beanutils 1.8.3 -> 1.9.2

codec 1.9 -> 1.10

collection 3.2.1 -> 3.2.2

xerces 2.11.0.SP3 -> 2.11.0.SP4

httpclient 4.2.1 -> 4.5

httpcore 4.2.1 -> 4.4.1

wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was

changed)

jboss-dmr 1.2.0 -> 1.3.0

Hibernate 4.3.7 -> 5.0.10

log4j-jboss-logmanager 1.1.0 -> 1.1.2

jcl-over-slf4j 1.7.2 -> 1.7.7

undertow-core 1.1.8 -> 1.4.0

undertow-servlet 1.1.8 -> 1.4.0

javax.mail 1.5.0 -> 1.5.5

jboss-jstl 1.1.2 -> 1.1.3

jboss-logging 3.1.4 -> 3.3.0

remoting-jmx 2.0.0 -> 2.0.1

slf4j-api 1.7.2 -> 1.7.7

picketbox 4.0.21 -> 4.9.6

jboss-websocket-api 1.1.0 -> 1.1.1

joda-time 1.6.2 -> 2.7

    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.1.4.GA.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.3.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.1.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-1.1.8.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-1.4.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-1.1.8.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-1.4.0.Final.jar
    • -0
    • +1
    /lams_build/lib/struts/struts.module.xml
  1. … 33 more files in changeset.
LDEV-4395 Merge Branch Portraits in Leader Tool and CSS Tweaks

LDEV-4395 Leader related tools use Portrait for leader

LDEV-4395 Tweaks to CSS and layouts for main page and portraits

LDEV-4395 Sizing tweaks

    • -0
    • +7
    /lams_central/web/css/_learner_base.scss
  1. … 19 more files in changeset.
LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

    • -0
    • +28
    /lams_admin/web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +28
    /lams_central/web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +28
    /lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +28
    /lams_learning/web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +28
    /lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +28
    /lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag
  1. … 74 more files in changeset.
Merge branch 'LDEV-4381'

LDEV-4381 Remove obsolete lamsAltServerUrl setting

This setting was used by lams_ld_template and

lams_ld_template_blackboard projects. It was intended to solve the

original issue related to LAMS having to run as http:// for the video

streaming tool, but needing https:// to keep the iframe communication

happy. But once everything was switched to https there is no need in

this setting.

    • -0
    • +5
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -3
    • +0
    /lams_bb_integration/web/admin/config.jsp
LDEV-4381 Add .project file

LDEV-4381 Removed requestSrc parameter

This parameter was responsible for passing integration server name to

LAMS which was used on closing authoring and refreshing integration

server page. It stopped working when authoring became Flash-less (as

there is not more "Close" button). And now we decided to finally remove

all its leftovers. This change also involves removal of

"isPostMessageToParent" parameter.

    • -16
    • +0
    /lams_central/web/lti/addLesson.jsp
LDEV-4381 Removed requestSrc parameter

This parameter was responsible for passing integration server name to

LAMS which was used on closing authoring and refreshing integration

server page. It stopped working when authoring became Flash-less (as

there is not more "Close" button). And now we decided to finally remove

all its leftovers. This change also involves removal of

"isPostMessageToParent" parameter.

    • -3
    • +0
    /moodle/mod/lamslesson/lang/en/lamslesson.php
    • -3
    • +0
    /moodle/mod/lamslesson/lang/fr/lamslesson.php
LDEV-4381 Removed requestSrc parameter

This parameter was responsible for passing integration server name to

LAMS which was used on closing authoring and refreshing integration

server page. This feature stopped working when authoring became

Flash-less (as there was no more "Close" button). And now we decided to

finally remove all its leftovers both in BB and LAMS sides. This change

also involves removal of "isPostMessageToParent" parameter.

Besides, all Blackboard methods that deal with lams.properties file are

now located in LamsPluginUtil only. All their duplicates in

LamsSecurityUtil (e.g. LamsSecurityUtil.getServerAddress(..)) were

removed

    • -3
    • +0
    /lams_bb_integration/web/admin/config.jsp
LDEV-4395 Tweaks to CSS and layouts for main page and portraits

Also deleted LESS files that are no longer needed

    • -0
    • +10
    /lams_central/conf/scss/_lams_variables.scss
    • -2
    • +17
    /lams_central/conf/scss/_mixins.scss
    • -1
    • +1
    /lams_central/web/comments/msgview.jsp
    • -6
    • +7
    /lams_central/web/css/_learner_base.scss
    • -219
    • +0
    /lams_central/web/less/defaultHTML_learner.less
    • -604
    • +0
    /lams_central/web/less/main.less
LDEV-4397: display shortenURL

Slightly modifying the UI

LDEV-4395: Incorporate portrait size changes from the LDEV-4398 branch

Merge branch 'LDEV-4398'

LDEV-4398 Enlarge the smallest portrait size to 35px

Also accommodate for this change on main and profile pages.

    • -1
    • +1
    /lams_central/web/css/_learner_base.scss
Merge branch 'LDEV-4397'

LDEV-4397 Bootstrap launchlearner.jsp

    • -24
    • +26
    /lams_central/web/launchlearner.jsp
Merge branch 'LDEV-4398'

LDEV-4398 Use imgscalr library for image resizing

Besides, switch to using only PNG files in order to prevent image

quality loosing.

LDEV-4398 Introduce imgscalr library for image resizing

Merge branch 'LDEV-4396'

LDEV-4396 Use new image resizing technique (imgscalr) for image gallery

As long as we moved portrait resizing mechanism to use imgscalr library,

we're migrating Image Gallery to also use it.

Besides, a few obsolete fields were removed from ImageGalleryItem.java

LDEV-4395 Merge branch. 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.

LDEV-4395 Clean up comments and debugging

LDEV-4397 Fix lesson URL shortener functionality

    • -15
    • +19
    /lams_monitoring/web/monitor.jsp