lams-github / lams_tool_vote / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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 30 Jan 2021
4:11 am

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -1
    • +15
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -0
    • +15
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
  3. … 20 more files in changeset.
Monday 25 Jan 2021
6:28 pm

Marcin Cieslak

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/dto/SessionDTO.java
    • -0
    • +18
    ./lamsfoundation/lams/tool/vote/dto/SummarySessionDTO.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -0
    • +49
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
    • -0
    • +11
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
  7. … 28 more files in changeset.
Sunday 20 Dec 2020
1:57 am

Marcin Cieslak

LDEV-5138 Set leader only on his activity entry, not on any user entry

Options
    • -44
    • +29
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +6
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
  3. … 25 more files in changeset.
Tuesday 28 Jul 2020
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  2. … 33 more files in changeset.
Wednesday 05 Feb 2020
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -6
    • +6
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
  4. … 23 more files in changeset.
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -6
    • +6
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
  4. … 23 more files in changeset.
Monday 20 Jan 2020
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20081203_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20170101_updateTo30.sql
  3. … 75 more files in changeset.
Sunday 19 Jan 2020
3:25 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20081203_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20170101_updateTo30.sql
  3. … 100 more files in changeset.
Friday 03 Jan 2020
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -23
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20180425.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20181202.sql
    • -17
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20190103.sql
    • -0
    • +41
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20190103_updateTo31.sql
  6. … 114 more files in changeset.
Saturday 28 Dec 2019
2:23 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

Options
    • -5
    • +21
    ./lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java
    • -44
    • +9
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
    • -163
    • +0
    ./lamsfoundation/lams/tool/vote/web/form/VoteMonitoringForm.java
  4. … 107 more files in changeset.
Wednesday 25 Dec 2019
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -27
    • +3
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
  2. … 63 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -4
    • +0
    ./lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -13
    • +17
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  3. … 41 more files in changeset.
Wednesday 13 Nov 2019
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -3
    • +2
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
  4. … 58 more files in changeset.
Friday 25 Jan 2019
2:46 pm

Marcin Cieslak

LDEV-4721 Fix version filter method names

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
  2. … 4 more files in changeset.
Tuesday 08 Jan 2019
4:11 am

Andrey Balan

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

Options
    • -26
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20131227.sql
    • -19
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20140102.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20140520.sql
    • -39
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20151217.sql
    • -26
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20161004.sql
    • -17
    • +0
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20170101.sql
    • -0
    • +78
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20170101_updateTo30.sql
    • -0
    • +17
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20190103.sql
  9. … 132 more files in changeset.
Friday 21 Dec 2018
7:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -4
    • +0
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
  2. … 20 more files in changeset.
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -16
    • +2
    ./lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -10
    • +8
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
  4. … 140 more files in changeset.
2:05 am

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -79
    • +0
    ./lamsfoundation/lams/tool/vote/service/VoteServiceProxy.java
  2. … 51 more files in changeset.
Monday 03 Dec 2018
9:39 am

Marcin Cieslak

LDEV-4721 Add class renaming filter for tool content import

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20181202.sql
    • -0
    • +4
    ./lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
  3. … 16 more files in changeset.
Monday 26 Nov 2018
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/vote/model/VoteQueContent.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/vote/model/VoteQueUsr.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/vote/model/VoteSession.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java
  5. … 167 more files in changeset.
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/vote/model/VoteQueContent.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/vote/model/VoteQueUsr.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/vote/model/VoteSession.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java
  5. … 167 more files in changeset.
Sunday 04 Nov 2018
5:48 pm

Marcin Cieslak

LDEV-4696 Remove obsolete DTO

Options
    • -5
    • +5
    ./lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
  3. … 13 more files in changeset.
Monday 29 Oct 2018
5:36 pm

Marcin Cieslak

LDEV-4696 Rewrite Vote to Hibernate annotations

Options
    • -6
    • +6
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
    • -10
    • +9
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
    • -8
    • +8
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
    • -11
    • +11
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
    • -61
    • +55
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -106
    • +38
    ./lamsfoundation/lams/tool/vote/model/VoteContent.java
    • -48
    • +22
    ./lamsfoundation/lams/tool/vote/model/VoteQueContent.java
    • -58
    • +25
    ./lamsfoundation/lams/tool/vote/model/VoteQueUsr.java
    • -88
    • +27
    ./lamsfoundation/lams/tool/vote/model/VoteSession.java
    • -75
    • +24
    ./lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java
    • -5
    • +3
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java
  14. … 5 more files in changeset.
Saturday 27 Oct 2018
12:16 am

Marcin Cieslak

LDEV-4696 Rename package with entities in Vote

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +455
    ./lamsfoundation/lams/tool/vote/model/VoteContent.java
    • -0
    • +169
    ./lamsfoundation/lams/tool/vote/model/VoteQueContent.java
    • -0
    • +219
    ./lamsfoundation/lams/tool/vote/model/VoteQueUsr.java
    • -0
    • +251
    ./lamsfoundation/lams/tool/vote/model/VoteSession.java
    • -0
    • +224
    ./lamsfoundation/lams/tool/vote/model/VoteUsrAttempt.java
  16. … 16 more files in changeset.
Thursday 04 Oct 2018
7:35 pm

Andrey Balan

LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java
    • -1
    • +0
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
    • -2
    • +0
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
    • -3
    • +0
    ./lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java
    • -1
    • +0
    ./lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java
  6. … 178 more files in changeset.
Monday 01 Oct 2018
6:33 pm

Marcin Cieslak

LDEV-4440 Fix converstion from array to collection

Storing checkboxes result in an array works differently in Struts form

and in Spring forms.

Options
    • -3
    • +5
    ./lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java
Saturday 15 Sep 2018
1:22 pm

Marcin Cieslak

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

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

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

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

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

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

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

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

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

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

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

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/authoring/web/LamsAuthoringFinishAction.java

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

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

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

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

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

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

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

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

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

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

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

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

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

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

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

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

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

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

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

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

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

lams_monitoring/web/gate/scheduleGateContent.jsp

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

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

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

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

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

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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

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

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

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

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

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

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

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

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

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

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

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

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

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

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

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

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

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

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

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

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

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

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

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

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

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.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/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

Options
    • -26
    • +2
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -7
    • +9
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/web/controller/ClearSessionController.java
    • -6
    • +4
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java
  7. … 643 more files in changeset.
Monday 10 Sep 2018
1:55 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

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

lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.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/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

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

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

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

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

lams_learning/.classpath

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

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

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

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

lams_tool_assessment/.classpath

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_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_lamc/.classpath

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

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

lams_tool_sbmt/.classpath

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

lams_tool_scratchie/.classpath

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

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

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

lams_tool_task/.classpath

lams_tool_vote/.classpath

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

lams_tool_wiki/.classpath

Options
    • -26
    • +2
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -5
    • +4
    ./lamsfoundation/lams/tool/vote/web/action/LearningAction.java
  3. … 102 more files in changeset.
Tuesday 28 Aug 2018
8:39 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_contentrepository

Options
    • -70
    • +0
    ./lamsfoundation/lams/tool/vote/util/VoteToolContentHandler.java
    • -4
    • +7
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  3. … 74 more files in changeset.
Saturday 25 Aug 2018
7:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
  3. … 108 more files in changeset.