lams-github / lams_central / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# 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/web/includes/javascript/authoring/authoringGeneral.js

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -3
    • +3
    ./lamsfoundation/lams/authoring/web/AuthoringController.java
    • -5
    • +10
    ./lamsfoundation/lams/web/HomeController.java
  3. … 18 more files in changeset.
Thursday 02 Jan 2020
8:39 pm

Ernie Ghiglione

LDEV-4932: Adding CSRF to forum and central

CSRF additions to:

- Forum authoring methods

- Adding outcomes to activities in tools (changes to tag and central methods)

Options
    • -1
    • +1
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 more files in changeset.
11:54 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central

Adding CSRF to:

- Lesson dependencies (add/remove)

- Set dates to finish lesson

Options
    • -4
    • +5
    ./lamsfoundation/lams/web/LessonConditionsController.java
  2. … 2 more files in changeset.
8:49 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

Options
    • -2
    • +3
    ./lamsfoundation/lams/web/EmailUserController.java
  2. … 10 more files in changeset.
Tuesday 31 Dec 2019
11:25 am

Ernie Ghiglione

LDEV-4932 Add CSRF to central (outcomes)

Adding CSRF protection to:

- Delete outcomes

Options
    • -2
    • +2
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 3 more files in changeset.
Monday 30 Dec 2019
8:30 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to admin

Adding CSRF token:

- When adding/editing learning outcomes

- Adding/editing and removing themes

Options
    • -2
    • +3
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 4 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -10
    • +8
    ./lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +0
    ./lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -6
    • +5
    ./lamsfoundation/lams/workspace/workspaceApplicationContext.xml
  4. … 40 more files in changeset.
6:18 am

Andrey Balan

LDEV-4930 Avoid displaying excessive user parameters on edit profile jsp

Options
    • -2
    • +0
    ./lamsfoundation/lams/web/ProfileController.java
    • -13
    • +1
    ./lamsfoundation/lams/web/ProfileSaveController.java
    • -23
    • +1
    ./lamsfoundation/lams/web/UserForm.java
  4. … 1 more file in changeset.
Monday 16 Dec 2019
8:37 pm

Marcin Cieslak

LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

Options
    • -2
    • +3
    ./lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  2. … 1 more file in changeset.
Wednesday 11 Dec 2019
5:56 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

Options
    • -4
    • +5
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 more files in changeset.
Monday 09 Dec 2019
7:59 pm

Marcin Cieslak

LDEV-4920 Use correct ID when informing which questions were imported

Options
    • -2
    • +3
    ./lamsfoundation/lams/web/qb/ImsQtiController.java
7:02 pm

Marcin Cieslak

LDEV-4920 Allow empty value for a request parameter

Options
    • -2
    • +2
    ./lamsfoundation/lams/web/QuestionsController.java
Saturday 07 Dec 2019
6:07 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

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

Options
    • -5
    • +5
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 2 more files in changeset.
3:39 am

Andrey Balan

LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

Options
    • -6
    • +5
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 more files in changeset.
Wednesday 04 Dec 2019
9:44 pm

Marcin Cieslak

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Options
    • -4
    • +23
    ./lamsfoundation/lams/web/QuestionsController.java
    • -3
    • +14
    ./lamsfoundation/lams/web/qb/ImsQtiController.java
  3. … 7 more files in changeset.
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -12
    • +29
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -0
    • +51
    ./lamsfoundation/lams/web/controller/CollapseOrganisationController.java
  3. … 12 more files in changeset.
Monday 25 Nov 2019
7:02 pm

Andrey Balan

LDEV-4908 When exporting VSAs in QTI, all options should be exported

Options
    • -32
    • +23
    ./lamsfoundation/lams/web/qb/ImsQtiController.java
Sunday 24 Nov 2019
11:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4907 Password changes corrected in audit

Options
    • -4
    • +1
    ./lamsfoundation/lams/web/PasswordChangeController.java
  2. … 1 more file in changeset.
Friday 22 Nov 2019
5:01 pm

Marcin Cieslak

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

Options
    • -8
    • +3
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  2. … 1 more file in changeset.
4:15 pm

Marcin Cieslak

LDEV-4535 Use vanilla LAMS label for naming groups in TBL template

Options
    • -8
    • +3
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
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
    ./lamsfoundation/lams/web/HomeController.java
  2. … 7 more files in changeset.
9:25 pm

Marcin Cieslak

Merge branch 'SP-3'

Options
    • -4
    • +5
    ./lamsfoundation/lams/web/HomeController.java
    • -0
    • +3
    ./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
    ./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
    ./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
    ./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
    ./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
    ./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
    ./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
    ./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
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 32 more files in changeset.