lams-github / lams_common

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 35
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
Wednesday 20 Nov 2019
6:35 pm

Marcin Cieslak

LDEV-4844 Add an event in audit log when QB questions get merged

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    ./java/org/lamsfoundation/lams/dbupdates/patch20190808.sql
    • -0
    • +1
    ./java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +23
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
6:32 pm

Marcin Cieslak

LDEV-4844 Fix answer merging for Assessment questions

Options
    • -2
    • +11
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
6:31 pm

Marcin Cieslak

LDEV-4844 Allow manual QB question merging

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +20
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +28
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  5. … 2 more files in changeset.
2:49 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

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

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 1 more file in changeset.
1:50 pm

Marcin Cieslak

LDEV-4746 Make options ordered when getting them from DB

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/model/QbQuestion.java
1:10 pm

Marcin Cieslak

LDEV-4746 Do not string img tags during migration

Options
    • -3
    • +6
    ./java/org/lamsfoundation/lams/dbupdates/patch20190721.sql
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

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/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -14
    • +21
    ./java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -41
    • +72
    ./java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
  3. … 20 more files in changeset.
Monday 18 Nov 2019
3:30 pm

Marcin Cieslak

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

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

Options
    • -5
    • +12
    ./java/org/lamsfoundation/lams/learning/service/ILearnerService.java
  2. … 14 more files in changeset.
6:08 am

Marcin Cieslak

LDEV-4904 Fix possible exception when converting SQL result into Java

Options
    • -6
    • +7
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
Friday 15 Nov 2019
11:09 pm

Andrey Balan

LDEV-4903 Fixed importing LD using a blank DB

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
2:30 pm

Andrey Balan

LDEV-4745 Handle situation when confidenceLevelActivity is set in Scratchie, but then the actual confidenceLevelActivity is later removed

Options
    • -1
    • +9
    ./java/org/lamsfoundation/lams/tool/service/LamsToolService.java
12:10 pm

Marcin Cieslak

LDEV-4900 Temporary fix for deadlock on tool session creation

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/toolApplicationContext.xml
Tuesday 12 Nov 2019
9:00 pm

Marcin Cieslak

LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learning/service/ILearnerService.java
  2. … 3 more files in changeset.
8:32 pm

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -1
    • +9
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -78
    • +79
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +0
    ./java/org/lamsfoundation/lams/integrationContext.xml
    • -0
    • +6
    ./java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/ToolSessionManager.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -41
    • +72
    ./java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
  8. … 54 more files in changeset.
Monday 11 Nov 2019
5:06 pm

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -5
    • +6
    ./java/org/lamsfoundation/lams/learning/service/ILearnerService.java
  2. … 5 more files in changeset.
Friday 08 Nov 2019
4: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
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/questions/QuestionExporter.java
    • -305
    • +307
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  5. … 24 more files in changeset.
Thursday 07 Nov 2019
8:11 pm

Marcin Cieslak

LDEV-4647 Convert escaped %20 characters back to spaces

Options
    • -8
    • +9
    ./java/org/lamsfoundation/lams/questions/QuestionExporter.java
Tuesday 05 Nov 2019
4:25 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

Options
    • -7
    • +0
    ./java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -18
    • +14
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
11:52 am

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
    • -9
    • +3
    ./java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -18
    • +14
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
  3. … 2 more files in changeset.
Friday 01 Nov 2019
7:08 pm

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
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
  3. … 5 more files in changeset.
6:41 pm

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -1
    • +10
    ./java/org/lamsfoundation/lams/util/excel/ExcelRow.java
  2. … 10 more files in changeset.
Thursday 31 Oct 2019
3:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -5
    • +5
    ./java/org/lamsfoundation/lams/util/excel/ExcelCell.java
    • -1
    • +24
    ./java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -0
    • +23
    ./java/org/lamsfoundation/lams/util/excel/ExcelSheet.java
    • -4
    • +4
    ./java/org/lamsfoundation/lams/util/excel/ExcelUtil.java
  5. … 12 more files in changeset.
8:58 am

Andrey Balan

LDEV-4858 Take care about percentages

Options
    • -0
    • +7
    ./java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -84
    • +32
    ./java/org/lamsfoundation/lams/util/excel/ExcelUtil.java
Wednesday 30 Oct 2019
5:35 pm

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
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -134
    • +0
    ./java/org/lamsfoundation/lams/util/ExcelCell.java
    • -463
    • +0
    ./java/org/lamsfoundation/lams/util/ExcelUtil.java
    • -0
    • +134
    ./java/org/lamsfoundation/lams/util/excel/ExcelCell.java
    • -0
    • +56
    ./java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -0
    • +38
    ./java/org/lamsfoundation/lams/util/excel/ExcelSheet.java
    • -0
    • +482
    ./java/org/lamsfoundation/lams/util/excel/ExcelUtil.java
  9. … 25 more files in changeset.
Tuesday 29 Oct 2019
11:08 pm

Andrey Balan

LDEV-4858 Set marks and other numeric values as numbers

Options
    • -4
    • +3
    ./java/org/lamsfoundation/lams/util/ExcelCell.java
    • -17
    • +29
    ./java/org/lamsfoundation/lams/util/ExcelUtil.java
Friday 25 Oct 2019
10:36 pm

Andrey Balan

LDEV-4858 Set marks and other numeric values as numbers

Options
    • -56
    • +58
    ./java/org/lamsfoundation/lams/util/ExcelUtil.java
9:19 pm

Andrey Balan

LDEV-4859 Include time with dates

Options
    • -11
    • +20
    ./java/org/lamsfoundation/lams/util/ExcelCell.java
    • -13
    • +64
    ./java/org/lamsfoundation/lams/util/ExcelUtil.java
  3. … 3 more files in changeset.
Thursday 24 Oct 2019
1:22 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/rest/RestTags.java
  2. … 9 more files in changeset.
Wednesday 23 Oct 2019
1: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
    • -0
    • +19
    ./java/org/lamsfoundation/lams/dbupdates/patch20191023.sql
    • -5
    • +13
    ./java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +6
    ./java/org/lamsfoundation/lams/questions/Question.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/questions/QuestionParser.java
  5. … 1 more file in changeset.
Monday 21 Oct 2019
4:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -7
    • +7
    ./java/org/lamsfoundation/lams/util/JsonUtil.java
  2. … 3 more files in changeset.