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
Friday 29 Jun 2018
11:14 pm

Marcin Cieslak

LDEV-4440 Show archived activity attempts in gradebook

Options
    • -7
    • +13
    ./java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -54
    • +57
    ./java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
  3. … 8 more files in changeset.
2:26 am

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • -0
    • +28
    ./java/org/lamsfoundation/lams/commonContext.xml
  2. … 5 more files in changeset.
Thursday 28 Jun 2018
3:22 pm

Marcin Cieslak

LDEV-4607 Detach gradebook output from activity if "no score" is chosen

Options
    • -2
    • +7
    ./java/org/lamsfoundation/lams/tool/service/LamsToolService.java
2:41 pm

Marcin Cieslak

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

Options
    • -0
    • +18
    ./java/org/lamsfoundation/lams/dbupdates/patch20180628.sql
    • -2
    • +11
    ./java/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java
    • -1
    • +13
    ./java/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java
  4. … 4 more files in changeset.
6:54 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -0
    • +77
    ./java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
    • -0
    • +37
    ./java/org/lamsfoundation/lams/policies/dto/UserPolicyConsentDTO.java
    • -7
    • +11
    ./java/org/lamsfoundation/lams/policies/service/IPolicyService.java
    • -21
    • +61
    ./java/org/lamsfoundation/lams/policies/service/PolicyService.java
  6. … 9 more files in changeset.
Monday 25 Jun 2018
11:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4603 Delete preview lessons with ratings now works

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +15
    ./java/org/lamsfoundation/lams/dbupdates/patch20180625.sql
  3. … 2 more files in changeset.
Sunday 24 Jun 2018
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
    • -1
    • +2
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -5
    • +41
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +18
    ./java/org/lamsfoundation/lams/rating/service/RatingService.java
  4. … 21 more files in changeset.
Saturday 23 Jun 2018
8:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch20180528.sql
    • -6
    • +12
    ./java/org/lamsfoundation/lams/policies/Policy.java
    • -0
    • +95
    ./java/org/lamsfoundation/lams/policies/PolicyDTO.java
    • -4
    • +20
    ./java/org/lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -11
    • +82
    ./java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
    • -3
    • +33
    ./java/org/lamsfoundation/lams/policies/service/IPolicyService.java
    • -20
    • +34
    ./java/org/lamsfoundation/lams/policies/service/PolicyService.java
  8. … 21 more files in changeset.
12:42 am

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • -14
    • +18
    ./java/org/lamsfoundation/lams/tool/service/LamsToolService.java
  2. … 11 more files in changeset.
Saturday 16 Jun 2018
11:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -7
    • +11
    ./java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
  5. … 6 more files in changeset.
Sunday 03 Jun 2018
11:42 am

Marcin Cieslak

LDEV-4597 Set sent date in emails

Options
    • -8
    • +11
    ./java/org/lamsfoundation/lams/util/Emailer.java
Saturday 02 Jun 2018
2:02 pm

Marcin Cieslak

LDEV-4592 Rewrite paths in tool content XML

Options
    • -5
    • +41
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
1:08 pm

Marcin Cieslak

LDEV-4592 Bump server version

LDs exported with this version do not undergo resources path rewriting

in XML.

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/dbupdates/patch20180602.sql
1:04 pm

Marcin Cieslak

LDEV-4592 Remove obsolete configuration keys

Options
    • -6
    • +0
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
10: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
11: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
12:03 pm

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.
5:21 am

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
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
    • -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
7: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
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
    • -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
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
    • -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.
Wednesday 16 May 2018
3:23 am

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
3:09 pm

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
2:35 pm

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
1:59 pm

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
7: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.
7: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
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
    ./java/org/lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +1
    ./java/org/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
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  2. … 1 more file in changeset.