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
Sunday 19 Aug 2018
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
    • -13
    • +30
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -3
    • +45
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +41
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -16
    • +82
    ./web/WEB-INF/struts-config.xml
    • -245
    • +216
    ./web/includes/javascript/openUrls.js
  7. … 98 more files in changeset.
Friday 17 Aug 2018
10:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Grade book

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
  2. … 4 more files in changeset.
1:19 pm

Marcin Cieslak

Merge from master to include x-editable

Options
    • -21
    • +18
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
Thursday 16 Aug 2018
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  4. … 116 more files in changeset.
Wednesday 15 Aug 2018
6:13 pm

Andrey Balan

LDEV-4534 Add x-editable library that allows inline editing

Options
    • -0
    • +663
    ./web/css/x-editable.css
    • binary
    ./web/images/css/clear.png
    • binary
    ./web/images/css/loading.gif
    • -0
    • +7
    ./web/includes/javascript/x-editable.js
Tuesday 14 Aug 2018
6:21 pm

Marcin Cieslak

LDEV-4644 Add OutcomeAutor tag for outcome mapping

Options
    • -3
    • +147
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
  2. … 20 more files in changeset.
Monday 13 Aug 2018
2:54 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4638 Option to turn on confidence levels for iRA tRA

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -4
    • +12
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/rest/RestTags.java
    • -1
    • +8
    ./web/authoring/template/tbl/tbl.jsp
  7. … 3 more files in changeset.
Sunday 12 Aug 2018
10:53 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4617: missing labels

Also changed email to correo electronico en Español.

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +19
    ./conf/language/lams/ApplicationResources_es_ES.properties
9:49 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4617 LDEV-4636: Adding lables

English and Español

Options
    • -20
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +15
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -7
    • +17
    ./conf/language/lams/ApplicationResources_es_ES.properties
9:39 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -5
    • +24
    ./conf/language/lams/ApplicationResources_el_GR.properties
Friday 10 Aug 2018
4:18 am

Andrey Balan

LDEV-4646 Introduce LoginServlet that will forward to login.jsp

It was added to be able to set locale for login.jsp. As

LocaleFilter doesn't get fired when login.jsp is requested.

Options
    • -0
    • +34
    ./src/java/org/lamsfoundation/lams/web/LoginServlet.java
    • -2
    • +13
    ./web/WEB-INF/web.xml
Thursday 09 Aug 2018
4:23 pm

Marcin Cieslak

LDEV-4644 Add scale management

Options
    • -2
    • +12
    ./conf/language/lams/ApplicationResources.properties
    • -35
    • +202
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -0
    • +93
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeScaleForm.java
    • -5
    • +19
    ./web/WEB-INF/struts-config.xml
    • -3
    • +7
    ./web/css/outcome.scss
    • -1
    • +0
    ./web/includes/javascript/main.js
    • -8
    • +55
    ./web/includes/javascript/outcome.js
    • -11
    • +16
    ./web/outcome/outcomeEdit.jsp
    • -49
    • +54
    ./web/outcome/outcomeManage.jsp
    • -0
    • +115
    ./web/outcome/scaleEdit.jsp
    • -0
    • +99
    ./web/outcome/scaleManage.jsp
  12. … 7 more files in changeset.
9:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4216: increasing tour popup sides to fix all language strings

The popup max-width is rather small for the button labels in some languages. increase from 276px to 320 instead.

Options
    • -1
    • +1
    ./web/css/bootstrap-tour.min.css
9:10 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4639: fixing string length

Fixing string length en Español

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
Wednesday 08 Aug 2018
5:46 pm

Marcin Cieslak

LDEV-4644 Global outcomes management via sysadmin

Options
    • -12
    • +7
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -8
    • +12
    ./web/outcome/outcomeEdit.jsp
    • -6
    • +4
    ./web/outcome/outcomeManage.jsp
  4. … 2 more files in changeset.
5:16 pm

Marcin Cieslak

LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

Options
    • -17
    • +24
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -2
    • +11
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java
    • -3
    • +2
    ./web/includes/javascript/outcome.js
    • -1
    • +2
    ./web/outcome/outcomeEdit.jsp
  5. … 11 more files in changeset.
Tuesday 07 Aug 2018
8:20 pm

Marcin Cieslak

LDEV-4644 Add/edit learning outcome

Options
    • -0
    • +1
    ./.gitignore
    • -3
    • +25
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +303
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -0
    • +84
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java
    • -9
    • +24
    ./web/WEB-INF/struts-config.xml
    • -0
    • +32
    ./web/css/outcome.scss
    • -0
    • +16
    ./web/includes/javascript/main.js
    • -0
    • +23
    ./web/includes/javascript/outcome.js
    • -0
    • +4
    ./web/main.jsp
    • -0
    • +128
    ./web/outcome/outcomeEdit.jsp
    • -0
    • +97
    ./web/outcome/outcomeManage.jsp
  13. … 2 more files in changeset.
Monday 06 Aug 2018
2:42 pm

Marcin Cieslak

LDEV-4644 Add outcomes in More Options on index page

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
Monday 30 Jul 2018
10:40 pm

Marcin Cieslak

LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

Options
    • -3
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -170
    • +0
    ./src/java/org/lamsfoundation/lams/web/TutorialAction.java
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -9
    • +0
    ./web/WEB-INF/struts-config.xml
    • -13
    • +0
    ./web/css/pedagogicalPlanner.css
    • -7
    • +2
    ./web/main.jsp
    • -35
    • +0
    ./web/profile/editprofile.jsp
    • -80
    • +0
    ./web/tutorialVideo.jsp
  10. … 11 more files in changeset.
Sunday 29 Jul 2018
5:48 pm

Marcin Cieslak

LDEV-4640, LDEV-4475 Do not make a chart bigger than available space

Options
    • -1
    • +1
    ./web/includes/javascript/chart.js
5:37 pm

Marcin Cieslak

LDEV-4640 Fix chart legend if there are no participants

Options
    • -3
    • +7
    ./web/includes/javascript/chart.js
  2. … 1 more file in changeset.
Friday 27 Jul 2018
2:49 am

Marcin Cieslak

LDEV-4636 Minor fixes in read-only feature

Options
    • -0
    • +4
    ./web/css/_authoring_base.scss
    • -2
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1
    ./web/includes/javascript/authoring/authoringMenu.js
Thursday 26 Jul 2018
7:29 pm

Marcin Cieslak

LDEV-4636 Use lock icon to depict read-only status

Options
    • -2
    • +2
    ./web/css/_authoring_base.scss
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -10
    • +8
    ./web/includes/javascript/authoring/authoringMenu.js
Tuesday 24 Jul 2018
11:37 pm

Marcin Cieslak

LDEV-4636 Initial implementation of read-only LDs feature

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -1
    • +9
    ./web/authoring/authoring.jsp
    • -0
    • +1
    ./web/authoring/svgGenerator.jsp
    • -0
    • +12
    ./web/css/_authoring_base.scss
    • -24
    • +70
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -11
    • +24
    ./web/includes/javascript/authoring/authoringMenu.js
2:20 am

Marcin Cieslak

LDEV-4617 Do not put HTML tags into i18n labels

Options
    • -10
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/web/action/SignupAction.java
Monday 23 Jul 2018
4:06 pm

Marcin Cieslak

LDEV-4617 i18n of signup emails

Options
    • -0
    • +12
    ./conf/language/lams/ApplicationResources.properties
    • -17
    • +10
    ./src/java/org/lamsfoundation/lams/web/action/SignupAction.java
Friday 20 Jul 2018
5:54 pm

Marcin Cieslak

LDEV-4440 Tweak file validators to return correct messages

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java
  2. … 3 more files in changeset.
5:25 pm

Marcin Cieslak

LDEV-4440 Rewrite validation in PedPlanner forms

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java
  3. … 7 more files in changeset.
5:28 am

Andrey Balan

LDEV-4627 Set country and locale for users created via integrations

New locale detecting algorithm:

1. Check whether we have exactly the same locale. If we do - select it.

2. Grab the first two letters of the provided locale (which we assume to

be the language code), and map it to one of our locales of the

respective language. If we have multiple ones - choose the first one

from the list indiscriminately.

3. If we don't have locale of such language - use the server default

one.

Options
    • -16
    • +5
    ./src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -23
    • +14
    ./src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -54
    • +38
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 4 more files in changeset.
5:25 am

Andrey Balan

LDEV-4627 Courses doesn't have specific locale any longer

Options
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/web/GradebookServlet.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java