lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 01 Feb 2018
9:39 pm

Marcin Cieslak

LDEV-4507 Use redirect after learner chooses a group

Plain Struts forward resulted in "learnerChooseGroup" being the current

address which could lead to unnecessary retransmissions.

Options
    • -2
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -5
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -24
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
8:33 pm

Marcin Cieslak

LDEV-4507 Prevent duplicate groups with a DB constraint

Lesson staff groups need to have order id different than 1 so they do

not clash with learner groups.

Fetch lesson learner count faster by an exact query rather than fetching

all learners with Hibernate and counting them.

Options
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180201.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -7
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -6
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
5:08 am

Andrey Balan

Merge branch 'LDEV-4506'

Options
5:08 am

Andrey Balan

LDEV-4506 Prevent exception after user resubmits results using two tabs

Options
    • -3
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Monday 29 Jan 2018
10:27 pm

Marcin Cieslak

Merge branch 'LDEV-4504'

Options
10:26 pm

Marcin Cieslak

LDEV-4504 Wrap activity names in links to pop up with their content

Options
    • -0
    • +34
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -0
    • +10
    /lams_learning/web/lessonComplete.jsp
4:41 pm

Marcin Cieslak

Merge branch 'LDEV-4454'

Conflicts:

lams_central/web/includes/javascript/chart.js

Options
    • -15
    • +48
    /lams_central/web/includes/javascript/chart.js
    • -3
    • +29
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
12:14 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 First cut of audit log screen implemented.

Options
    • -0
    • +7
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +195
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java
    • -0
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +21
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +5
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -0
    • +214
    /lams_admin/web/logevent.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +11
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml
    • -0
    • +53
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEventType.hbm.xml
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +52
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180123.sql
    • -5
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +63
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java
  16. … 5 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +0
    /lams_central/.classpath
    • -22
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java
    • -1
    • +0
    /lams_gradebook/.classpath
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -11
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  16. … 64 more files in changeset.
9:02 pm

Andrey Balan

LDEV-4407 Move shared classes from lams_learning to lams_common

This is done in order to eliminate the need for other projects to

depend on lams_learning.

Options
    • -0
    • +326
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -0
    • +57
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +73
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -0
    • +60
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java
    • -0
    • +152
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java
    • -0
    • +65
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java
    • -4
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -0
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -324
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -63
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -4
    • +19
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -73
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -60
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java
    • -152
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -65
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/GateActivityDTO.java
    • -20
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
7:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -1
    • +0
    /lams_central/.classpath
    • -1
    • +0
    /lams_tool_assessment/.classpath
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -1
    • +0
    /lams_tool_bbb/.classpath
    • -1
    • +0
    /lams_tool_chat/.classpath
    • -1
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java
    • -1
    • +0
    /lams_tool_daco/.classpath
    • -2
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
    • -3
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
    • -98
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -16
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
    • -2
    • +2
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/util/DacoToolContentHandler.java
    • -1
    • +0
    /lams_tool_doku/.classpath
    • -1
    • +0
    /lams_tool_eadventure/.classpath
    • -1
    • +0
    /lams_tool_forum/.classpath
  16. … 63 more files in changeset.
7:12 am

Andrey Balan

LDEV-4407 Move shared contentrepository classes to lams_common

This is done in order to eliminate the need for other projects to

be dependent on lams_contentrepository.

Options
    • -0
    • +52
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/ITicket.java
    • -0
    • +85
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java
    • -0
    • +199
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +396
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java
    • -0
    • +74
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/exception/FileException.java
    • -0
    • +73
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/exception/InvalidParameterException.java
    • -0
    • +74
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemNotFoundException.java
    • -0
    • +93
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryCheckedException.java
    • -0
    • +488
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java
    • -52
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ITicket.java
    • -85
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java
    • -223
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -418
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java
    • -74
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/FileException.java
    • -73
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/InvalidParameterException.java
  16. … 3 more files in changeset.
Wednesday 24 Jan 2018
8:52 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4502: Google content shows in popup window

Options
    • -0
    • +14
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180123.sql
    • -4
    • +4
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
2:22 am

Andrey Balan

LDEV-4407 Move ped planner stuff to lams_planer

All ped planner related code moved out from lams_central and

lams_common to lams_planer. Although

PedagogicalPlannerActivityForm.java was moved from

lams_central to lams_common to be accessible by LAMS tools.

Options
    • -1
    • +0
    /lams_central/build.xml
    • -8
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -22
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -5
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -2030
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -115
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -149
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
    • -263
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • -78
    • +0
    /lams_central/web/WEB-INF/struts-config.xml
    • -193
    • +0
    /lams_central/web/css/pedagogicalPlanner.css
    • -2
    • +2
    /lams_central/web/includes/javascript/openUrls.js
    • -379
    • +0
    /lams_central/web/includes/javascript/pedagogicalPlanner.js
    • -103
    • +0
    /lams_central/web/tutorialVideo.jsp
    • -70
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml
    • -150
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
  16. … 10 more files in changeset.
Tuesday 23 Jan 2018
9:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch LDEV-4499

Options
9:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4499 Answers are timestamped in the export spreadsheet

Options
    • -1
    • +1
    /lams_tool_survey/conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
Monday 22 Jan 2018
9:09 pm

Marcin Cieslak

Merge branch 'LDEV-4500'

Options
9:08 pm

Marcin Cieslak

LDEV-4500 Check if all activities in TBL sequence are grouped

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -3
    • +57
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
11:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4498 Portrait displayed on user search screen.

Options
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -2
    • +9
    /lams_admin/web/usersearchlist.jsp
Thursday 18 Jan 2018
6:43 pm

Marcin Cieslak

Merge branch 'LDEV-4497'

Options
6:41 pm

Marcin Cieslak

LDEV-4497 Split content folder ID when browsing uploaded files

Options
    • -1
    • +8
    /lams_central/web/ckeditor/filemanager/browser/default/browser.html
6:20 pm

Marcin Cieslak

LDEV-4497 Split authored image path when saving

Options
    • -4
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
5:47 pm

Marcin Cieslak

LDEV-4497 Read LD thumbs from either old or new dir structure

Also focus only on SVG images as PNGs are not supported anymore.

Also use only one source of LD thumbs top dir.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -25
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -7
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -19
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
5:23 pm

Marcin Cieslak

LDEV-4497 Split LD thumb path when saving

Options
    • -8
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
1:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4413 Share Resources no longer requires a title

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -0
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -16
    • +0
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4495 Able to rerate all already entries when max rate used.

Options
    • -1
    • +14
    /lams_central/web/includes/javascript/rating.js
8:02 am

Andrey Balan

LDEV-4496 People from the same group get the "same shuffle"

Options
    • -1
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Monday 15 Jan 2018
11:05 pm

Andrey Balan

Merge branch 'LDEV-4494'

Options
11:00 pm

Andrey Balan

LDEV-4494 Avoid cloning/importing lessons created by old NTU plugin

Options
    • -1
    • +6
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
    • -3
    • +3
    /lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/LinkToolsServlet.java
    • -1
    • +1
    /lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/UpdateServerUrlServlet.java
    • -2
    • +2
    /lams_bb_integration/src/org/lamsfoundation/bb/integration/util/BlackboardUtil.java
Monday 08 Jan 2018
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-3805 Reflections are paged

Options
    • -1
    • +0
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties