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
Saturday 02 Jun 2018
4:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 7 more files in changeset.
Thursday 31 May 2018
5:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +28
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +70
    ./java/org/lamsfoundation/lams/dbupdates/patch20180528.sql
    • -0
    • +164
    ./java/org/lamsfoundation/lams/policies/Policy.java
    • -0
    • +60
    ./java/org/lamsfoundation/lams/policies/PolicyConsent.java
    • -0
    • +42
    ./java/org/lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -0
    • +40
    ./java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
    • -0
    • +43
    ./java/org/lamsfoundation/lams/policies/service/IPolicyService.java
    • -0
    • +84
    ./java/org/lamsfoundation/lams/policies/service/PolicyService.java
  9. … 14 more files in changeset.
Friday 25 May 2018
6:03 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
    • -2
    • +18
    ./java/org/lamsfoundation/lams/rating/service/RatingService.java
  3. … 2 more files in changeset.
Thursday 24 May 2018
11:21 pm

Andrey Balan

* LDEV-4589 Add methods and constants for LTI Deep Linking

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/integration/util/LtiUtils.java
Tuesday 22 May 2018
11:59 am

Marcin Cieslak

LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/dbupdates/patch20180522.sql
    • -4
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -0
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
  6. … 10 more files in changeset.
Monday 21 May 2018
1:03 pm

Marcin Cieslak

LDEV-4587 Silence i18n warning as they are not that important

Options
    • -4
    • +4
    ./java/org/lamsfoundation/lams/tool/OutputFactory.java
1:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • -11
    • +19
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
  3. … 5 more files in changeset.
Friday 18 May 2018
12:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

Options
    • -0
    • +8
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -3
    • +17
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  3. … 21 more files in changeset.
Tuesday 15 May 2018
9:23 pm

Andrey Balan

LDEV-4583 Block access to index.do for integration learners

If user comes from integrations and possess only learner rights we

should not allow him/her to access index.do page.

Options
    • -0
    • +8
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
  3. … 1 more file in changeset.
Friday 11 May 2018
9:09 am

Marcin Cieslak

LDEV-4580, LDEV-4497 Fix content dir path when exporting/importing LD

Options
    • -3
    • +17
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
8:35 am

Marcin Cieslak

LDEV-4581 QTI export now parses images with names with whitespace

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/questions/QuestionExporter.java
Wednesday 09 May 2018
7:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -0
    • +9
    ./java/org/lamsfoundation/lams/comments/Comment.java
    • -4
    • +8
    ./java/org/lamsfoundation/lams/comments/service/CommentService.java
    • -4
    • +5
    ./java/org/lamsfoundation/lams/comments/service/ICommentService.java
    • -0
    • +15
    ./java/org/lamsfoundation/lams/dbupdates/patch20180508.sql
  5. … 89 more files in changeset.
Thursday 03 May 2018
1:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +35
    ./java/org/lamsfoundation/lams/dbupdates/patch20180425.sql
    • -35
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
1:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Rename dbupdate file as name is a month out.

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/dbupdates/patch20180501.sql
    • -14
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch20180601.sql
Tuesday 01 May 2018
3:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +1
    ./java/org/lamsfoundation/lams/logevent/LogEvent.java
  3. … 5 more files in changeset.
11:09 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  2. … 1 more file in changeset.
8:10 am

Marcin Cieslak

LDEV-4562 Refresh update date on user password change

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Monday 30 Apr 2018
6:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +35
    ./java/org/lamsfoundation/lams/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Saturday 21 Apr 2018
12:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

Options
    • -10
    • +11
    ./java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -10
    • +23
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
  3. … 19 more files in changeset.
Tuesday 03 Apr 2018
6:25 am

Marcin Cieslak

LDEV-3000 Import special UTF8 characters

When exporting, text which has special UTF8 characters gets split into

multiple parts: CDATA, the character, CDATA. LAMS importer is now ready

to parse it.

Options
    • -6
    • +10
    ./java/org/lamsfoundation/lams/questions/QuestionParser.java
Thursday 29 Mar 2018
1:35 pm

Marcin Cieslak

LDEV-4538 Display gate open user and time in monitoring

Options
    • -10
    • +0
    ./java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java
  3. … 11 more files in changeset.
11:53 am

Marcin Cieslak

LDEV-4538 Persist new gate parameters: open user and time

Options
    • -0
    • +13
    ./java/org/lamsfoundation/lams/dbupdates/patch20180329.sql
    • -1
    • +20
    ./java/org/lamsfoundation/lams/learningdesign/GateActivity.java
  3. … 2 more files in changeset.
11:50 am

Marcin Cieslak

LDEV-4538 Gate can not be already open in authoring

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
  2. … 1 more file in changeset.
Tuesday 27 Mar 2018
8:24 am

Marcin Cieslak

LDEV-4293 Clear login mapping even if user DTO is not present

Options
    • -13
    • +13
    ./java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -1
    • +15
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
  3. … 1 more file in changeset.
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

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

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -8
    • +3
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -20
    • +23
    ./java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -41
    • +16
    ./java/org/lamsfoundation/lams/rating/service/RatingService.java
  4. … 81 more files in changeset.
Thursday 22 Mar 2018
6:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -5
    • +10
    ./java/org/lamsfoundation/lams/web/util/CustomStrutsExceptionHandler.java
  2. … 34 more files in changeset.
Wednesday 21 Mar 2018
2:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4535 Changes to TBL Template

Added support for a Peer Review activity, Monitor selected group

count saved properly the application exercises are grouped.

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
    • -30
    • +6
    ./java/org/lamsfoundation/lams/rating/service/RatingService.java
  3. … 13 more files in changeset.
Sunday 04 Mar 2018
2:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -10
    • +20
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 12 more files in changeset.
Wednesday 28 Feb 2018
7:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/usermanagement/User.java
  2. … 8 more files in changeset.
Friday 23 Feb 2018
9:43 am

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/IUserDAO.java
    • -7
    • +12
    ./java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  5. … 4 more files in changeset.