lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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 03 May 2018
7:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180501.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20180601.sql
Tuesday 01 May 2018
9: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
    ./lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +1
    ./lamsfoundation/lams/logevent/LogEvent.java
  3. … 5 more files in changeset.
5:09 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

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

Marcin Cieslak

LDEV-4562 Refresh update date on user password change

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +35
    ./lamsfoundation/lams/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Saturday 21 Apr 2018
6: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
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -10
    • +23
    ./lamsfoundation/lams/web/session/SessionManager.java
  3. … 19 more files in changeset.
Tuesday 03 Apr 2018
12:25 pm

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
    ./lamsfoundation/lams/questions/QuestionParser.java
Thursday 29 Mar 2018
7:35 pm

Marcin Cieslak

LDEV-4538 Display gate open user and time in monitoring

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

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-4538 Gate can not be already open in authoring

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

Marcin Cieslak

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

Options
    • -13
    • +13
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -1
    • +15
    ./lamsfoundation/lams/web/session/SessionManager.java
  3. … 1 more file in changeset.
Saturday 24 Mar 2018
2:12 am

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
    ./lamsfoundation/lams/commonContext.xml
    • -20
    • +23
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -41
    • +16
    ./lamsfoundation/lams/rating/service/RatingService.java
  4. … 81 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -5
    • +10
    ./lamsfoundation/lams/web/util/CustomStrutsExceptionHandler.java
  2. … 34 more files in changeset.
Wednesday 21 Mar 2018
9: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
    ./lamsfoundation/lams/rating/model/RatingCriteria.java
    • -30
    • +6
    ./lamsfoundation/lams/rating/service/RatingService.java
  3. … 13 more files in changeset.
Sunday 04 Mar 2018
9: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
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -10
    • +20
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 12 more files in changeset.
Wednesday 28 Feb 2018
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

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

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • -3
    • +3
    ./lamsfoundation/lams/usermanagement/IUserDAO.java
    • -7
    • +12
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +3
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  5. … 4 more files in changeset.
Thursday 22 Feb 2018
6:08 pm

Marcin Cieslak

LDEV-4519 Make random passwords easier

Options
    • -3
    • +1
    ./lamsfoundation/lams/integration/security/RandomPasswordGenerator.java
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -1
    • +1
    ./lamsfoundation/lams/comments/Comment.java
    • -1
    • +2
    ./lamsfoundation/lams/comments/commentsContext.xml
    • -9
    • +56
    ./lamsfoundation/lams/comments/service/CommentService.java
    • -8
    • +0
    ./lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -10
    • +7
    ./lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -5
    • +5
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -3
    • +5
    ./lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -0
    • +2
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -21
    • +36
    ./lamsfoundation/lams/logevent/service/LogEventService.java
    • -9
    • +5
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -1
    • +1
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -229
    • +0
    ./lamsfoundation/lams/util/audit/AuditService.java
    • -138
    • +0
    ./lamsfoundation/lams/util/audit/IAuditService.java
  15. … 52 more files in changeset.
Wednesday 21 Feb 2018
11:09 pm

Marcin Cieslak

LDEV-4519 Add paged, sortable user grids

Options
    • -0
    • +4
    ./lamsfoundation/lams/usermanagement/IUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/usermanagement/dao/IRoleDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java
    • -9
    • +35
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -0
    • +5
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -2
    • +13
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  7. … 5 more files in changeset.
Tuesday 20 Feb 2018
4:57 pm

Marcin Cieslak

LDEV-4519 Add complex password generator

Options
    • -3
    • +57
    ./lamsfoundation/lams/integration/security/RandomPasswordGenerator.java
Monday 19 Feb 2018
12:28 pm

Marcin Cieslak

LDEV-3640 There should be a cascade in case of ID change, not set null

Options
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20180218.sql
12:56 am

Marcin Cieslak

LDEV-3640 Add cascades so LDs can get removed

Options
    • -0
    • +25
    ./lamsfoundation/lams/dbupdates/patch20180218.sql
Wednesday 14 Feb 2018
6:42 pm

Marcin Cieslak

LDEV-4516 Allow "-" chars in image path when exporting to QTI

Options
    • -1
    • +1
    ./lamsfoundation/lams/questions/QuestionExporter.java
Tuesday 13 Feb 2018
2:08 am

Andrey Balan

LDEV-4512 Calculate lessonMaxPossibleMark properly

Take into account whether learning design uses grade weights.

Options
    • -18
    • +25
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  2. … 1 more file in changeset.
1:52 am

Andrey Balan

LDEV-4512 Move isWeightedMarks method to LamsCoreToolService

Move isWeightedMarks(LearningDesign design) from GradebookService

to LamsCoreToolService in order to avoid creation of a new

dependency on lams_gradebook.

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -0
    • +17
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  3. … 2 more files in changeset.
Monday 12 Feb 2018
4:25 pm

Marcin Cieslak

LDEV-4507 Add queries which remove group duplicates before adding index

Options
    • -0
    • +41
    ./lamsfoundation/lams/dbupdates/patch20180201.sql
Friday 09 Feb 2018
4:42 pm

Marcin Cieslak

LDEV-4507 Add query allowing index to be created on existing DB

Options
    • -0
    • +2
    ./lamsfoundation/lams/dbupdates/patch20180201.sql
Wednesday 07 Feb 2018
6:32 pm

Marcin Cieslak

LDEV-4508 Log when a Kumalive learner raises and lowers a hand

Options
    • -0
    • +22
    ./lamsfoundation/lams/dbupdates/patch20180207.sql
  2. … 6 more files in changeset.
Tuesday 06 Feb 2018
10:55 pm

Marcin Cieslak

LDEV-4507 Use DTOs instead of entities as page attributes

It seems that using entities as page attributes outside a transaction

causes undesired effect. Portrait tag fetches data from DB and existing

entities, including group participants, get flushed from session. It

overwrites changes made by learners being added to a group.

Options
    • -0
    • +17
    ./lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -0
    • +68
    ./lamsfoundation/lams/usermanagement/dto/UserBasicDTO.java
  3. … 4 more files in changeset.