lams-github / lams_build / lib / lams

lams.jar

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
Last Commit: 08 Oct 18
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 06 Jul 2018
12:59 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Almost finished learning and monitoring - needed corrections

Options
    • binary
    ./lams.jar
  2. … 16 more files in changeset.
Thursday 05 Jul 2018
8:04 pm

Andrey Balan

Merge branch 'LDEV-4614'

Options
    • binary
    ./lams.jar
5:05 am

Andrey Balan

Merge branch 'LDEV-4620'

Options
    • binary
    ./lams.jar
Saturday 30 Jun 2018
1:22 pm

Marcin Cieslak

LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.

Options
    • binary
    ./lams.jar
  2. … 10 more files in changeset.
5:37 am

Andrey Balan

Merge branch 'LDEV-4605'

Options
    • binary
    ./lams.jar
  2. … 1 more file in changeset.
Friday 29 Jun 2018
11:14 pm

Marcin Cieslak

LDEV-4440 Show archived activity attempts in gradebook

Options
    • binary
    ./lams.jar
  2. … 9 more files in changeset.
8:09 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Finishing authoring migration

Options
    • binary
    ./lams.jar
  2. … 19 more files in changeset.
2:26 am

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • binary
    ./lams.jar
  2. … 5 more files in changeset.
Thursday 28 Jun 2018
2:41 pm

Marcin Cieslak

LDEV-4609 Add archive date to gradebook marks on lesson restart

Options
    • binary
    ./lams.jar
  2. … 6 more files in changeset.
Sunday 24 Jun 2018
9:26 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

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

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

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

Options
    • binary
    ./lams.jar
  2. … 14 more files in changeset.
8:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • binary
    ./lams.jar
  2. … 23 more files in changeset.
Saturday 16 Jun 2018
11:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • binary
    ./lams.jar
  2. … 9 more files in changeset.
Saturday 02 Jun 2018
10:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • binary
    ./lams.jar
  2. … 8 more files in changeset.
Sunday 27 May 2018
12:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • binary
    ./lams.jar
Friday 25 May 2018
5:25 am

Andrey Balan

Merge branch 'LDEV-4589'

Options
    • binary
    ./lams.jar
Tuesday 22 May 2018
5:59 pm

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
    • binary
    ./lams.jar
  2. … 14 more files in changeset.
Monday 21 May 2018
7: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
    • binary
    ./lams.jar
  2. … 6 more files in changeset.
Friday 18 May 2018
6: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
    • binary
    ./lams.jar
  2. … 22 more files in changeset.
Wednesday 16 May 2018
3:23 am

Andrey Balan

Merge branch 'LDEV-4583'

Options
    • binary
    ./lams.jar
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • binary
    ./lams.jar
  2. … 92 more files in changeset.
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
    • binary
    ./lams.jar
  2. … 6 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
    • binary
    ./lams.jar
  2. … 20 more files in changeset.
Thursday 29 Mar 2018
5:53 pm

Marcin Cieslak

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

Options
    • binary
    ./lams.jar
  2. … 3 more files in changeset.
Wednesday 28 Mar 2018
5:54 am

Andrey Balan

Merge branch 'LDEV-4537'

Options
    • binary
    ./lams.jar
  2. … 1 more file in changeset.
Tuesday 27 Mar 2018
8:27 pm

Marcin Cieslak

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

Options
    • binary
    ./lams.jar
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
    • binary
    ./lams.jar
  2. … 83 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
    • binary
    ./lams.jar
  2. … 13 more files in changeset.
Tuesday 27 Feb 2018
11:02 am

Andrey Balan

Merge branch 'LKC-89'

Options
    • binary
    ./lams.jar
  2. … 2 more files in changeset.
Friday 23 Feb 2018
4:43 pm

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • binary
    ./lams.jar
  2. … 7 more files in changeset.
Thursday 22 Feb 2018
8:37 pm

Marcin Cieslak

LDEV-4519 Add form validation and success message

Options
    • binary
    ./lams.jar
  2. … 4 more files in changeset.