lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4054: Updating Greek

Updating greek

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

    • -22
    • +31
    /lams_central/web/css/_learner_base.scss
    • -0
    • +5
    /lams_central/web/css/free.ui.jqgrid.min.css
    • -55
    • +29
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -104
    • +94
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -48
    • +30
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4443: Ooops

swap file shouldn't have been committed. Too many terminals open :-)

LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

    • -0
    • +4
    /lams_tool_lamc/web/monitoring/Edit.jsp
    • -0
    • +4
    /lams_tool_vote/web/monitoring/Edit.jsp
LDEV-4437 Propogates Monitor Leader mark changes to group members

LDEV-4400, LDEV-3315 Comment out a test parameter

It should be uncommented only for TestHarness.

LDEV-4400, LDEV-3315 Toggle session ID change for each LAMS module

WildFly 10 changes session ID after authentication by default in order

to prevent session fixation attack. It breaks TestHarness, though. In

order to run TH, session ID change needs to be turned off.

Turning it off for Central is not enough as a request to any other

module, like Tool, triggers session ID change. In this case we need to

have session ID change turned on or off in each LAMS module, not just

Central.

Merge branch 'LDEV-4441'

LDEV-4441 CKEditor bootsnippets plugin to support i18n

Make bootsnippets plugin to support i18n. Besides of the plugin's

internal labels, we're also going to translate labels from

/lams_www/web/public/ckeditor-templates/bootsnippets.js (but only

snippets' titles).

LDEV-4054: Updating translations

Updating Greek

LDEV-4400 Remove an unnecessary import as it fails JSP compilation

Fix merged lams.jar

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Merge branch 'LDEV-4439'

LDEV-4439 Fix a typo in optional activity properties init code

LDEV-4438 Remove unique constraint added in the previous patch

The new constraint handles all problematic cases including the one with

copying results from leaders. Thus we no longer need

UQ_tl_laasse10_assessment_result_4 (assessment_uid, user_uid,

finish_date) constraint.

LDEV-4054: Updating translations

Updating English and Spanish for various projects

LDEV-4438 fix autopatch script typo

Merge branch 'LDEV-4438'

LDEV-4438 Add unique constraint (assessment_uid, user_uid, latest)

Add unique constraint (assessment_uid, user_uid, latest) to

tl_laasse10_assessment_result which will apply only in case latest=1. It

was done by making 'latest' field contain only NULL or 1 (as opposite to

the previously used 0 or 1). This way constraint will apply only in

cases when 'latest' is 1.

Merge branch 'LDEV-4415' Marks can now be weighted

LDEV-4435 Portraits displayed for View Learners grouping option

    • -4
    • +10
    /lams_learning/web/grouping/choose.jsp
LDEV-4054: Adding Greek

Adding Greek to peer review tool

    • -0
    • +177
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
LDEV-4054: Updating translations

Updating Greek and Norwegian

LDEV-4054: Updating translations

Updating English, Greek and Norwegian

LDEV-4054: Updating translations

Updating English and Greek

LDEV-4054: Updating translations

Updating Greek

LDEV-4054: Updating translations

Updating English

LDEV-4054: Updating translations

Translating English and Greek

LDEV-4054: Updating translations

Updating Greek and English