lams-github / lams_central

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 21 Nov 2019
9:36 pm

Marcin Cieslak

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

Options
    • -3
    • +6
    ./java/org/lamsfoundation/lams/web/HomeController.java
  2. … 7 more files in changeset.
9:25 pm

Marcin Cieslak

Merge branch 'SP-3'

Options
    • -4
    • +5
    ./java/org/lamsfoundation/lams/web/HomeController.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
  3. … 6 more files in changeset.
1:40 am

Marcin Cieslak

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/web/qb/QbStatsController.java
  2. … 1 more file in changeset.
1:31 am

Marcin Cieslak

LDEV-4844 Allow manual QB question merging

Options
    • -0
    • +37
    ./java/org/lamsfoundation/lams/web/qb/QbStatsController.java
  2. … 5 more files in changeset.
Wednesday 20 Nov 2019
9:17 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Options
    • -2
    • +9
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
6:52 pm

Marcin Cieslak

LDEV-4535 Create group names even if i18n label was not found

Missing label makes groups unusable in LD.

Options
    • -37
    • +51
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 27 more files in changeset.
Tuesday 05 Nov 2019
6:52 pm

Marcin Cieslak

LDEV-4901 Rewrite session invalidation mechanism

On WildFly 8 session invalidation mechanism had some bugs. Marek

introduced a workaround in LDEV-3413. The mechanism was adjusted in

LDEV-4293, especially in this commit

https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=131ce42e64069f574a2a4a9bc1e5c4be4918e5bb

Newer WildFly versions do not seem to have this bug. A part of

workaround was removed in LDEV-4696, but invalidation mechanism stayed

as if the bugs were still present. The mechanism introduced the problem

with timeouts. Now that the bugs seems to be gone, the invalidation

mechanism was rewritten to a more straightforward version which should

have been used from the start.

It is worth keeping in mind that when one user session is present and

another is being created (another browser, integration call, sysadmin's

LoginAs feature), then user gets authenticated, then old session gets

invalidated and the user gets authenticated AGAIN by WildFly using

cached credentials. Caching is so useful that we can not turn it off. It

means that, though, we need to keep login token generated by

LoginRequestServlet for longer than just first authentication, as we get

authentication call twice. Now we keep it until it is timed out.

Options
    • -7
    • +12
    ./java/org/lamsfoundation/lams/security/UniversalLoginModule.java
  2. … 3 more files in changeset.
Saturday 02 Nov 2019
2:08 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_el_GR.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 6 more files in changeset.
Thursday 31 Oct 2019
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 32 more files in changeset.
Tuesday 29 Oct 2019
4:35 am

Andrey Balan

LDEV-4896 Add groupings to the course instead of subcourse

Options
    • -16
    • +15
    ./java/org/lamsfoundation/lams/web/OrganisationGroupController.java
Friday 25 Oct 2019
8:52 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/web/HomeController.java
  2. … 1 more file in changeset.
8:50 pm

Andrey Balan

LDEV-4879 Create lesson in subgroups at one go

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/web/HomeController.java
  2. … 4 more files in changeset.
Thursday 24 Oct 2019
7:22 pm

Marcin Cieslak

LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

Options
    • -7
    • +17
    ./java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -35
    • +43
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -104
    • +129
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  4. … 7 more files in changeset.
4:28 am

Andrey Balan

LDEV-4892 Log all request parameters coming to LoginRequestLtiServlet

Options
    • -0
    • +19
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Wednesday 23 Oct 2019
7:20 pm

Marcin Cieslak

LDEV-4884 Make QB UUID processing easier

Also allow setting QB UUID on import and not generate it always when a

question gets saved into DB.

Options
    • -9
    • +5
    ./java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
  2. … 4 more files in changeset.
Tuesday 22 Oct 2019
8:11 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -9
    • +32
    ./java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -3
    • +14
    ./java/org/lamsfoundation/lams/web/qb/SearchQBController.java
  3. … 8 more files in changeset.
Thursday 17 Oct 2019
1:12 pm

Marcin Cieslak

LDEV-4884 UUIDs in QTI export/import in QB

Options
    • -0
    • +48
    ./java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
  2. … 4 more files in changeset.
Thursday 10 Oct 2019
6:08 am

Andrey Balan

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
  2. … 2 more files in changeset.
6:08 am

Andrey Balan

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
  2. … 2 more files in changeset.
Wednesday 09 Oct 2019
4:16 pm

Andrey Balan

LDEV-4876 Ability for LTI servers to get userId using alternative request parameter name

Options
    • -4
    • +9
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
  2. … 5 more files in changeset.
5:35 am

Andrey Balan

LDEV-4875 Portrait tag to use double quotes for src parameter

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/tag/PortraitTag.java
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -9
    • +32
    ./java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +14
    ./java/org/lamsfoundation/lams/web/qb/SearchQBController.java
  4. … 73 more files in changeset.
Thursday 12 Sep 2019
6:43 pm

Andrey Balan

LDEV-4869 Show error message in case lesson does not exist

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
6:42 pm

Andrey Balan

LDEV-4869 Prevent authentication of LTI learners with blank lessonId

Also show relevant warning message.

Options
    • -9
    • +17
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
Wednesday 11 Sep 2019
5:35 pm

Andrey Balan

LDEV-4869 Take into account blank lsid parameter

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
1:34 am

Andrey Balan

LDEV-4870 add instructor to lesson's staff when he logs in using LTI

* Also refactor LoginRequestDispatcher.java: move its methods to

LoginRequestServlet and its constants to a new IntegrationConstants

class.

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -6
    • +6
    ./java/org/lamsfoundation/lams/rest/RestServlet.java
    • -12
    • +12
    ./java/org/lamsfoundation/lams/web/GradebookServlet.java
    • -17
    • +17
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -28
    • +116
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -6
    • +6
    ./java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -12
    • +12
    ./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  10. … 3 more files in changeset.
Tuesday 10 Sep 2019
5:47 pm

Marcin Cieslak

LKC-215 Allow creating new QB questions from within WA

We need new question UID after it got created.

Options
    • -9
    • +1
    ./java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
Monday 09 Sep 2019
10:24 pm

Marcin Cieslak

LKC-215 Importing questions from QB to WA

Options
    • -27
    • +34
    ./java/org/lamsfoundation/lams/web/qb/SearchQBController.java
  2. … 1 more file in changeset.
Monday 02 Sep 2019
9:26 pm

Andrey Balan

LDEV-4589 Add users to course prior to cloning the lesson

Options
    • -3
    • +7
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  3. … 2 more files in changeset.