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
Tuesday 21 Aug 2018
1:30 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin in progress

Options
    • -2
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java
    • -3
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -3
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
    • -7
    • +7
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java
    • -5
    • +5
    /lams_admin/web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    /lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    /lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -9
    • +7
    /lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
    • -3
    • +4
    /lams_admin/web/WEB-INF/tags/Page.tag
  16. … 13 more files in changeset.
1:12 am

Marcin Cieslak

Merge branch 'LDEV-4650' into LDEV-4644

Options
    • binary
    /lams_build/lib/lams/lams.jar
1:12 am

Marcin Cieslak

LDEV-4650 Add default, immutable outcome scale

Options
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -3
    • +0
    /lams_central/web/outcome/outcomeEdit.jsp
    • -1
    • +1
    /lams_central/web/outcome/scaleEdit.jsp
    • -2
    • +2
    /lams_central/web/outcome/scaleManage.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180802.sql
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
12:42 am

Marcin Cieslak

LDEV-4644 Add missing jQuery UI CSS

Options
    • -1
    • +1
    /lams_tool_images/web/pages/authoring/authoring.jsp
    • -1
    • +1
    /lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
    • -0
    • +2
    /lams_tool_wiki/web/pages/authoring/headItems.jsp
Monday 20 Aug 2018
11:27 pm

Andrey Balan

LDEV-4407 move gradebook classes to lams_gradebook

Options
    • -5
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -123
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -711
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -118
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java
    • -97
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java
    • -0
    • +6
    /lams_gradebook/.classpath
    • -0
    • +123
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -0
    • +711
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
9:56 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook noStruts library

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +1
    /lams_central/web/includes/javascript/progressBar.js
    • -1
    • +1
    /lams_gradebook/.classpath
    • -3
    • +0
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
    • -121
    • +0
    /lams_gradebook/web/WEB-INF/struts-config.xml
    • -22
    • +0
    /lams_gradebook/web/WEB-INF/tiles-defs.xml
    • -186
    • +0
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -212
    • +0
    /lams_gradebook/web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    /lams_gradebook/web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    /lams_gradebook/web/WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    /lams_gradebook/web/WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    /lams_gradebook/web/WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    /lams_gradebook/web/WEB-INF/tlds/struts/struts-logic.tld
  16. … 11 more files in changeset.
9:42 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin in progress

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java
    • -2
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java
    • -4
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java
    • -5
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
    • -3
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelController.java
    • -6
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java
    • -5
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java
    • -4
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java
    • -14
    • +13
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
    • -5
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
  16. … 41 more files in changeset.
8:00 pm

Marcin Cieslak

Merge branch 'LDEV-4648' into LDEV-4644

Options
8:00 pm

Marcin Cieslak

LDEV-4648 Adjust layout for archived attempts

Options
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -14
    • +12
    /lams_gradebook/web/gradebookMonitor.jsp
7:31 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning minor fixes

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/main.js
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
    • -1
    • +1
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -1
    • +1
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -4
    • +3
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
7:29 pm

Marcin Cieslak

Merge latest LDEV-4609 to adjust layout for archived attempts

Options
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -4
    • +66
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +2
    /lams_gradebook/web/gradebookMonitor.jsp
7:26 pm

Marcin Cieslak

LDEV-4648 Put start and end dates as tooltip in gradebook

Options
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -25
    • +43
    /lams_gradebook/web/gradebookMonitor.jsp
7:07 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4639 Force the tour to start at the first screen everytime

Options
    • -0
    • +1
    /lams_central/web/mainTour.jsp
5:53 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Lams build libraries

Options
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams-learning.jar
5:52 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook

Options
    • -6
    • +6
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
    • -3
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java
    • -5
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -1
    • +1
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -5
    • +5
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -2
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ActivityController.java
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java
    • -3
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java
    • -2
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
11:51 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Schedule gate monitoring works for a scheduled lesson

Options
    • -0
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +17
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -1
    • +1
    /lams_monitoring/web/gate/scheduleGateContent.jsp
Sunday 19 Aug 2018
11:14 pm

Marcin Cieslak

LDEV-4644 Display and edit outcome results in monitor gradebook

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -8
    • +18
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +88
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -0
    • +19
    /lams_central/web/css/x-editable-lams.css
    • -1
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/outcome/OutcomeResult.hbm.xml
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -0
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -0
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -25
    • +26
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -12
    • +20
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +39
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  16. … 4 more files in changeset.
1:44 am

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

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

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

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

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

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

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

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

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

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

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

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/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

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

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • binary
    /lams_build/lib/lams/lams-contentrepository.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -13
    • +30
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -3
    • +45
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +41
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -16
    • +82
    /lams_central/web/WEB-INF/struts-config.xml
    • -245
    • +216
    /lams_central/web/includes/javascript/openUrls.js
    • -8
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -7
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -54
    • +57
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +118
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java
    • -0
    • +97
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java
    • -1
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
  16. … 89 more files in changeset.
Friday 17 Aug 2018
10:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Grade book

Options
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java
    • -2
    • +2
    /lams_gradebook/web/gradebookCourseLearner.jsp
7:30 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration / changes at jsp files

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
    • -18
    • +74
    /lams_admin/web/config/editconfig.jsp
    • -11
    • +14
    /lams_admin/web/config/items.jsp
    • -1
    • +2
    /lams_admin/web/error.jsp
    • -100
    • +210
    /lams_admin/web/import/importexcel.jsp
    • -76
    • +193
    /lams_admin/web/ldap.jsp
    • -86
    • +204
    /lams_admin/web/lti/ltiConsumer.jsp
    • -61
    • +169
    /lams_admin/web/lti/ltiConsumerList.jsp
    • -4
    • +2
    /lams_admin/web/organisation/cloneStart.jsp
    • -76
    • +199
    /lams_admin/web/organisation/courseAdminEdit.jsp
    • -156
    • +341
    /lams_admin/web/organisation/createOrEdit.jsp
    • -60
    • +131
    /lams_admin/web/organisation/deleteAllLessons.jsp
    • -296
    • +546
    /lams_admin/web/organisation/list.jsp
    • -57
    • +155
    /lams_admin/web/remove.jsp
    • -98
    • +224
    /lams_admin/web/servermaintain.jsp
  16. … 8 more files in changeset.
6:26 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning server start

Options
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -0
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
    • -98
    • +118
    /lams_learning/web/branching/preview.jsp
    • -21
    • +38
    /lams_learning/web/branching/wait.jsp
    • -34
    • +54
    /lams_learning/web/close.jsp
    • -22
    • +53
    /lams_learning/web/gate/conditionGateContent.jsp
    • -22
    • +54
    /lams_learning/web/gate/permissionGateContent.jsp
    • -39
    • +71
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -11
    • +40
    /lams_learning/web/gate/synchGateContent.jsp
    • -82
    • +100
    /lams_learning/web/grouping/choose.jsp
    • -85
    • +105
    /lams_learning/web/grouping/show.jsp
    • -27
    • +38
    /lams_learning/web/grouping/wait.jsp
    • -171
    • +190
    /lams_learning/web/lessonComplete.jsp
  16. … 11 more files in changeset.
1:19 pm

Marcin Cieslak

Merge from master to include x-editable

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -21
    • +18
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -14
    • +11
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
Thursday 16 Aug 2018
11:46 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Actions changed to controllers

Options
    • -15
    • +15
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -19
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -2
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java
    • -4
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java
    • -141
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigAction.java
    • -0
    • +140
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
    • -73
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageAction.java
    • -0
    • +79
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java
    • -61
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelAction.java
    • -0
    • +59
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelController.java
    • -109
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveAction.java
    • -0
    • +112
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java
    • -80
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsAction.java
    • -0
    • +83
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java
    • -93
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultAction.java
  16. … 67 more files in changeset.
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -1
    • +4
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +4
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +4
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    /lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
  16. … 104 more files in changeset.
9:59 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning

Options
    • -17
    • +15
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java
    • -13
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java
    • -11
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -12
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
    • -17
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -14
    • +12
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java
    • -11
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java
    • -19
    • +17
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -28
    • +20
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -454
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerAction.java
    • -0
    • +480
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -97
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityAction.java
    • -0
    • +112
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java
    • -133
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityAction.java
    • -0
    • +143
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java
  16. … 41 more files in changeset.
11:28 am

Marcin Cieslak

LDEV-4609 Export previous lesson attempts

Options
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -1
    • +65
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
10:43 am

Marcin Cieslak

LDEV-4609 Remove "restart date" column of previous attempts in gradebook

Options
    • -1
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -5
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -3
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +2
    /lams_gradebook/web/gradebookMonitor.jsp
9:51 am

Marcin Cieslak

LDEV-4644 OutcomeAuthor tag layout adjustments

Options
    • -1
    • +1
    /lams_tool_nb/conf/language/lams/ApplicationResources.properties
    • -17
    • +33
    /lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
Wednesday 15 Aug 2018
6:24 pm

Andrey Balan

Merge branch 'LDEV-4534'

Options
6:19 pm

Andrey Balan

LDEV-4534 Ability to rename lesson title

Options
    • -0
    • +31
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +30
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -1
    • +28
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -3
    • +7
    /lams_monitoring/web/monitor.jsp