lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Monday 10 Sep 2018
2:10 am

Marcin Cieslak

Merge learning outcomes LDEV-4644 into lams31

Options
    • -1
    • +43
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -1
    • +30
    ./web/WEB-INF/struts-config.xml
    • -0
    • +4
    ./web/main.jsp
    • -27
    • +0
    ./web/css/outcome.css
    • -45
    • +0
    ./web/css/outcome.scss
  8. … 8 more files in changeset.
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
    • -4
    • +0
    ./.classpath
    • -21
    • +19
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -272
    • +28
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +142
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -19
    • +24
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -6
    • +16
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -17
    • +22
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/rest/RestServlet.java
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -9
    • +10
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/webservice/RegisterAction.java
    • -18
    • +9
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -2
    • +13
    ./web/WEB-INF/web.xml
  15. … 90 more files in changeset.
Saturday 08 Sep 2018
3:55 am

Andrey Balan

LDEV-4658 Add new config setting "Enable profile portrait editing"

Options
    • -0
    • +4
    ./web/includes/javascript/webrtc-capturestill.js
    • -67
    • +73
    ./web/profile/portrait.jsp
  3. … 3 more files in changeset.
Tuesday 04 Sep 2018
5:00 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 fixed paths at Central

Options
    • -2
    • +2
    ./web/emailuser.jsp
    • -1
    • +1
    ./web/includes/javascript/dialog.js
Friday 31 Aug 2018
6:08 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning branching fixes

Options
    • -22
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
  2. … 2 more files in changeset.
5:19 pm

Marcin Cieslak

LDEV-4440 Various fixes in admin

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/LoginAsController.java
    • -4
    • +5
    ./web/login.jsp
  3. … 6 more files in changeset.
5:13 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 EXportContetContrller

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
5:13 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Portrait fix

Options
    • -32
    • +34
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
    • -2
    • +2
    ./web/authoring/template/comms.jsp
    • -8
    • +8
    ./web/includes/javascript/openUrls.js
    • -4
    • +4
    ./web/portrait.jsp
  6. … 4 more files in changeset.
11:23 am

Marcin Cieslak

LDEV-4649 Outcome import

Options
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -8
    • +28
    ./web/outcome/outcomeManage.jsp
  3. … 3 more files in changeset.
11:04 am

Marcin Cieslak

LDEV-4649 Scale import

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +36
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -1
    • +5
    ./web/css/outcome.scss
    • -1
    • +9
    ./web/includes/javascript/outcome.js
    • -1
    • +18
    ./web/outcome/scaleManage.jsp
  6. … 2 more files in changeset.
12:27 am

Andrey Balan

LDEV-4653 enforceAllowLearnerRestart can't be null

Options
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  2. … 4 more files in changeset.
Thursday 30 Aug 2018
11:02 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central Tbl fixes

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +1
    ./web/authoring/template/list.jsp
10:23 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central minor fixes

Options
    • -1
    • +1
    ./web/authoring/template/comms.jsp
    • -1
    • +0
    ./web/findUserLessons.jsp
    • -1
    • +0
    ./web/forgotPassword.jsp
    • -1
    • +0
    ./web/notificationsprivate.jsp
9:29 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 LAMS Central learning link fixed

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -1
    • +1
    ./web/WEB-INF/spring-servlet.xml
    • -1
    • +1
    ./web/authoring/template/comms.jsp
    • -1
    • +1
    ./web/authoring/template/list.jsp
    • -1
    • +1
    ./web/editLessonIntro.jsp
    • -1
    • +1
    ./web/emailuser.jsp
    • -2
    • +1
    ./web/forgotPassword.jsp
    • -3
    • +2
    ./web/forgotPasswordChange.jsp
    • -8
    • +4
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -4
    • +3
    ./web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +1
    ./web/includes/javascript/openUrls.js
    • -16
    • +9
    ./web/includes/javascript/orgGroup.js
    • -1
    • +1
    ./web/includes/javascript/pedagogicalPlanner.js
    • -2
    • +1
    ./web/main.jsp
    • -2
    • +1
    ./web/signup/loginTab.jsp
  16. … 13 more files in changeset.
8:02 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 changed paths (monitoring)

Options
    • -16
    • +9
    ./web/includes/javascript/orgGroup.js
6:30 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central noStruts Library

Options
    • -1
    • +1
    ./.classpath
    • -195
    • +195
    ./src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/web/ProfileController.java
    • -100
    • +100
    ./src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java
    • -114
    • +114
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/web/tag/HtmlTag.java
  9. … 6 more files in changeset.
6:28 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 trying to solve problems with grouping upload

Options
    • -2
    • +3
    ./web/orgGroup.jsp
  2. … 2 more files in changeset.
5:16 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central minor fixes

Options
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/comments/web/CommentForm.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/HomeController.java
    • -9
    • +2
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
    • -12
    • +3
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -6
    • +14
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -9
    • +7
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerController.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • -191
    • +0
    ./src/java/org/lamsfoundation/lams/web/tag/MultiLinesTextareaTag.java
    • -849
    • +0
    ./web/WEB-INF/struts-config.xml
    • -48
    • +0
    ./web/WEB-INF/tiles-defs.xml
    • -185
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
    • -212
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html-el.tld
  16. … 15 more files in changeset.
12:22 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-3322: adding ids/tags for all authoring tests

Options
    • -4
    • +4
    ./web/authoring/authoring.jsp
    • -0
    • +2
    ./web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./web/includes/javascript/dialog.js
Wednesday 29 Aug 2018
11:08 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central monitoring links foxed

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/GradebookServlet.java
    • -14
    • +14
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -7
    • +11
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -5
    • +2
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -2
    • +1
    ./web/includes/javascript/authoring/authoringMenu.js
9:45 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central minor fixes

Options
    • -1
    • +1
    ./.classpath
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/web/HomeController.java
    • -2
    • +2
    ./web/includes/javascript/main.js
    • -6
    • +6
    ./web/includes/javascript/openUrls.js
    • -7
    • +5
    ./web/indexLessonConditions.jsp
    • -1
    • +1
    ./web/lessonIntro.jsp
    • -4
    • +4
    ./web/profile.jsp
    • -1
    • +1
    ./web/twoFactorAuthSecret.jsp
  9. … 1 more file in changeset.
4:56 pm

Marcin Cieslak

LDEV-4440 Small fixes after merge

Options
    • -1
    • +1
    ./web/includes/javascript/addLesson.js
    • -12
    • +0
    ./web/includes/javascript/openUrls.js
4:38 pm

Marcin Cieslak

Merge Asia's and Michal's progress in core projects

Options
    • -5
    • +3
    ./web/includes/javascript/addLesson.js
    • -2
    • +2
    ./web/includes/javascript/dialog.js
    • -2
    • +2
    ./web/includes/javascript/main.js
    • -0
    • +12
    ./web/includes/javascript/openUrls.js
  5. … 2 more files in changeset.
4:30 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central migration

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/PasswordController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -1
    • +1
    ./web/includes/javascript/main.js
    • -1
    • +1
    ./web/passwordChangeContent.jsp
    • -8
    • +8
    ./web/portrait.jsp
    • -4
    • +4
    ./web/profile.jsp
  9. … 1 more file in changeset.
12:10 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4407 Corrected name of the authoring service bean

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
4:01 am

Andrey Balan

LDEV-4653 Add param "Learners can restart the lesson" to integrations

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -7
    • +16
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  3. … 8 more files in changeset.
Tuesday 28 Aug 2018
10:37 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Central migration

Options
    • -1
    • +1
    ./.classpath
    • -40
    • +49
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -0
    • +48
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/EmailUserController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/web/HomeController.java
    • -10
    • +10
    ./src/java/org/lamsfoundation/lams/web/IndexController.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/LessonConditionsController.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
    • -4
    • +9
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/ProfileController.java
    • -9
    • +13
    ./src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
    • -1
    • +1
    ./web/WEB-INF/spring-servlet.xml
  16. … 38 more files in changeset.
9:40 pm

Andrey Balan

LDEV-4407 Fix link to pedPlanner

Options
    • -2
    • +2
    ./web/includes/javascript/openUrls.js
8:46 pm

Andrey Balan

Merge branch 'LDEV-4407'

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  2. … 4 more files in changeset.
8:39 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_contentrepository

Options
    • -77
    • +0
    ./src/java/org/lamsfoundation/lams/util/CentralToolContentHandler.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/web/webApplicationContext.xml
    • -10
    • +0
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
  6. … 71 more files in changeset.