lams-github / lams_central

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 28 Jun 2018
8:26 pm

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/web/IndexAction.java
  2. … 5 more files in changeset.
8:18 pm

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

Options
    • -0
    • +12
    ./java/org/lamsfoundation/lams/web/ProfileAction.java
  2. … 9 more files in changeset.
Sunday 24 Jun 2018
3: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
    • -9
    • +9
    ./java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java
  2. … 14 more files in changeset.
2: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
    • -8
    • +14
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/RatingServlet.java
    • -30
    • +179
    ./java/org/lamsfoundation/lams/web/action/LtiAction.java
  4. … 21 more files in changeset.
Saturday 23 Jun 2018
2:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -1
    • +11
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +26
    ./java/org/lamsfoundation/lams/web/ProfileAction.java
    • -64
    • +23
    ./java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
  4. … 25 more files in changeset.
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
    • -8
    • +14
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +36
    ./java/org/lamsfoundation/lams/web/LoginAsAction.java
  3. … 7 more files in changeset.
Thursday 31 May 2018
5:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +153
    ./java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
  3. … 20 more files in changeset.
Monday 28 May 2018
4:14 pm

Andrey Balan

LDEV-4589 Fix warning message

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/action/LtiAction.java
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
    • +1
    ./java/org/lamsfoundation/lams/web/RatingServlet.java
  2. … 3 more files in changeset.
Thursday 24 May 2018
11:22 pm

Andrey Balan

LDEV-4589 Implement LTI Deep Linking feature

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +156
    ./java/org/lamsfoundation/lams/web/action/LtiAction.java
  3. … 1 more file in changeset.
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
    • +3
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
  2. … 14 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
    • -1
    • +0
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +14
    ./java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -6
    • +23
    ./java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +22
    ./java/org/lamsfoundation/lams/web/IndexAction.java
  5. … 19 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
    • +21
    ./java/org/lamsfoundation/lams/web/IndexAction.java
  2. … 2 more files in changeset.
Wednesday 09 May 2018
7:46 pm

Marcin Cieslak

LDEV-4576 Ignore edit lock parameter when saving a LD

It is set by special functions in AuthoringService

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
7:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/comments/CommentConstants.java
    • -5
    • +14
    ./java/org/lamsfoundation/lams/comments/web/CommentAction.java
  3. … 91 more files in changeset.
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/authoring/service/AuthoringService.java
  2. … 6 more files in changeset.
11:11 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/LoginAsAction.java
11:09 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/PasswordChangeAction.java
  2. … 1 more file 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
    • -2
    • +0
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +160
    ./java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +35
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -38
    • +70
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +22
    ./java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/SessionListener.java
  7. … 15 more files in changeset.
Monday 16 Apr 2018
1:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 All assessment questions in one Application Exercise

Options
    • -21
    • +10
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
8:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 Template TBL Assessment offers multiple choice

Options
    • -0
    • +156
    ./java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +33
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -19
    • +61
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
  4. … 13 more files in changeset.
Thursday 05 Apr 2018
2:08 pm

Marcin Cieslak

LDEV-4544 Highlight folder where existing LD resides

Options
    • -1
    • +23
    ./java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
  2. … 2 more files in changeset.
Thursday 29 Mar 2018
11:50 am

Marcin Cieslak

LDEV-4538 Gate can not be already open in authoring

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
  2. … 1 more file in changeset.
Tuesday 27 Mar 2018
11:51 pm

Andrey Balan

LDEV-4537 Add Peer Review tab to TBL monitoring

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/util/CentralConstants.java
  2. … 8 more files in changeset.
8:24 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/SessionListener.java
  2. … 2 more files 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
    • -29
    • +17
    ./java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -7
    • +1
    ./java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -0
    • +119
    ./java/org/lamsfoundation/lams/authoring/template/AssessMCAnswer.java
    • -0
    • +103
    ./java/org/lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
    • -0
    • +103
    ./java/org/lamsfoundation/lams/authoring/template/SurveyQuestion.java
    • -0
    • +188
    ./java/org/lamsfoundation/lams/authoring/template/TemplateData.java
    • -0
    • +1515
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -0
    • +401
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -6
    • +15
    ./java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -6
    • +14
    ./java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -27
    • +24
    ./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  14. … 71 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
    • +101
    ./java/org/lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
    • -25
    • +83
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -20
    • +91
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
  4. … 12 more files in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/web/IndexAction.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  3. … 33 more files in changeset.
Tuesday 27 Feb 2018
3:29 am

Andrey Balan

LKC-89 add auxiliary methods required for TBL monitoring

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/util/CentralConstants.java
    • -8
    • +3
    ./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  3. … 3 more files in changeset.
Thursday 22 Feb 2018
2:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -4
    • +4
    ./java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -9
    • +9
    ./java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
  3. … 64 more files in changeset.