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
Wednesday 30 May 2018
8:18 pm

Marcin Cieslak

LDEV-4587 Display all ordered branches in progress bar

Ordered branching should be displayed similarly to optional sequences.

Options
    • -2
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
8:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Websockets replace polling for multiuser mode

Options
    • -2
    • +3
    /lams_tool_mindmap/.classpath
    • -0
    • +19
    /lams_tool_mindmap/build.xml
    • -1
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java
    • -1
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java
    • -2
    • +7
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java
    • -5
    • +6
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
    • -0
    • +8
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java
    • -2
    • +2
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
    • -3
    • +4
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -291
    • +14
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -0
    • +290
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningWebsocketServer.java
    • -86
    • +114
    /lams_tool_mindmap/web/common/mapjs.jsp
Monday 28 May 2018
10:14 pm

Andrey Balan

LDEV-4589 Fix warning message

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
4:37 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

Merge branch 'LDEV_NTU-9'

Options
4:36 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV_NTU-9 Allowfullscreen for iframe CKeditor plugin is not working.

Options
    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
    • -1
    • +1
    /lams_central/web/ckeditor/lang/en-au.js
    • -2
    • +2
    /lams_central/web/ckeditor/plugins/iframe/dialogs/iframe.js
2:58 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

Merge branch 'LDEV_NTU-7'

Options
2:54 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV_NTU-7 Page jumps to the top when clicking the link in Grouping.

Options
    • -10
    • +39
    /lams_central/web/orgGroup.jsp
12:52 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Authoring mode and layout tweaks

Options
    • -24
    • +36
    /lams_tool_mindmap/web/common/mapjs.jsp
    • -2
    • +2
    /lams_tool_mindmap/web/includes/css/mindmap.scss
10:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Adding a colour picker

Options
    • -0
    • +319
    /lams_central/web/css/jquery.minicolors.css
    • binary
    /lams_central/web/images/css/jquery.minicolors.png
    • -0
    • +8
    /lams_central/web/includes/javascript/jquery.minicolors.min.js
    • -3
    • +3
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
    • -103
    • +0
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -22
    • +65
    /lams_tool_mindmap/web/common/mapjs.jsp
    • -1
    • +0
    /lams_tool_mindmap/web/includes/css/mindmap.scss
    • -54
    • +79
    /lams_tool_mindmap/web/includes/javascript/mapjs/main.js
    • -1
    • +2
    /lams_tool_mindmap/web/pages/authoring/authoring.jsp
    • -1
    • +4
    /lams_tool_mindmap/web/pages/learning/mindmap.jsp
    • -4
    • +5
    /lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
Sunday 27 May 2018
12:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • binary
    /lams_build/lib/lams/lams.jar
Friday 25 May 2018
12:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
    • -2
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -0
    • +6
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
5:25 am

Andrey Balan

Merge branch 'LDEV-4589'

Options
    • binary
    /lams_build/lib/lams/lams.jar
5:22 am

Andrey Balan

LDEV-4589 Implement LTI Deep Linking feature

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +156
    /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -0
    • +5
    /lams_central/web/lti/addLesson.jsp
5:21 am

Andrey Balan

* LDEV-4589 Add methods and constants for LTI Deep Linking

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
5:19 am

Andrey Balan

* LDEV-4589 Added few parameter names required for Deep linking

Options
    • -4
    • +4
    /3rdParty_sources/basiclti-util/readme by LAMS.txt
    • -1
    • +6
    /3rdParty_sources/basiclti-util/src/main/java/org/imsglobal/lti/BasicLTIConstants.java
    • binary
    /lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar
Tuesday 22 May 2018
8:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Flash removed from authoring, learning and monitor

Options
    • -0
    • +16
    /lams_tool_mindmap/.externalToolBuilders/SASS Mindmap.launch
    • -0
    • +1
    /lams_tool_mindmap/.gitignore
    • -0
    • +9
    /lams_tool_mindmap/.project
    • -1
    • +3
    /lams_tool_mindmap/build.properties
    • -85
    • +0
    /lams_tool_mindmap/conf/language/ApplicationResources.properties
    • -8
    • +12
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20180517.sql
    • -0
    • +141
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/IdeaJSON.java
    • -0
    • +57
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/NotifyActionJSON.java
    • -0
    • +48
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/NotifyResponseJSON.java
    • -0
    • +102
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
    • -3
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
    • -37
    • +12
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -0
    • +4
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/PollResponseModel.java
    • -74
    • +34
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
  16. … 15 more files in changeset.
6:19 pm

Marcin Cieslak

LDEV-4587 Refresh output definitions if new ones appeared

Options
    • -13
    • +20
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
5:59 pm

Marcin Cieslak

LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +6
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +5
    /lams_central/web/css/_authoring_base.scss
    • -1
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -4
    • +18
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180522.sql
    • -4
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
4:50 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-3115: Missing label for sequence detail

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_central/web/authoring/authoring.jsp
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -17
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -17
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -76
    • +63
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -5
    • +5
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -5
    • +5
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -16
    • +16
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -32
    • +32
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -9
    • +9
    /lams_tool_bbb/conf/language/lams/ApplicationResources_es_ES.properties
    • -9
    • +7
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 34 more files in changeset.
11:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4459: small formatting change

Options
    • -2
    • +2
    /lams_monitoring/web/emailnotifications/lessonNotifications.jsp
Monday 21 May 2018
11:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Adding template labels

Previously removed by accidents as they aren't in i18n yet

Options
    • -0
    • +54
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +54
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -60
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -58
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -62
    • +385
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -5
    • +156
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_daco/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +4
    /lams_tool_gmap/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_images/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_imscc/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 11 more files in changeset.
7:03 pm

Marcin Cieslak

LDEV-4587 Silence i18n warning as they are not that important

Options
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -70
    • +137
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +8
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +8
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +29
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +78
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +30
    /lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
    • -4
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -26
    • +74
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -24
    • +9
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
    • -21
    • +12
    /lams_tool_daco/conf/language/lams/ApplicationResources_es_ES.properties
    • -14
    • +18
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +6
    /lams_tool_forum/conf/language/lams/ApplicationResources_no_NO.properties
    • -6
    • +9
    /lams_tool_gmap/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 24 more files in changeset.
7:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -11
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -4
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +23
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -12
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -24
    • +79
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
Friday 18 May 2018
6:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

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

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

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_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • -16
    • +51
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -6
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -3
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -45
    • +68
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -4
    • +20
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -1
    • +38
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +42
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -25
    • +48
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  16. … 8 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4587 Add new assessment output type

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -3
    • +26
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
1:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4585 Activity names in Greek appear properly in export file.

Options
    • -3
    • +21
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -9
    • +10
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
10:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4586 Letter prefixes shown on results page

Options
    • -3
    • +6
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp