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
Monday 04 Jun 2018
11:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4588'

Options
11:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Show creator name as hover in multiuser mode

Options
    • -4
    • +8
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/IdeaJSON.java
    • -4
    • +2
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
    • -1
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
    • -17
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -4
    • +27
    /lams_tool_mindmap/web/common/mapjs.jsp
    • -0
    • +13
    /lams_tool_mindmap/web/includes/css/mindmap.scss
Sunday 03 Jun 2018
11:44 am

Marcin Cieslak

Merge branch 'LDEV-4597'

Options
11:42 am

Marcin Cieslak

LDEV-4597 Set sent date in emails

Options
    • -8
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java
Saturday 02 Jun 2018
2:03 pm

Marcin Cieslak

Merge branch 'LDEV-4592'

Options
2:02 pm

Marcin Cieslak

LDEV-4592 Rewrite paths in tool content XML

Options
    • -5
    • +41
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
1:08 pm

Marcin Cieslak

LDEV-4592 Bump server version

LDs exported with this version do not undergo resources path rewriting

in XML.

Options
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180602.sql
1:04 pm

Marcin Cieslak

LDEV-4592 Remove obsolete configuration keys

Options
    • -6
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
10:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -8
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +36
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java
    • -0
    • +6
    /lams_central/web/WEB-INF/struts-config.xml
    • -0
    • +37
    /lams_central/web/errorpages/errorWithMessage.jsp
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Thursday 31 May 2018
11:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +31
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +265
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +37
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +12
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -0
    • +138
    /lams_admin/web/policies/edit.jsp
    • -0
    • +115
    /lams_admin/web/policies/list.jsp
    • -0
    • +81
    /lams_admin/web/policies/previousVersionsList.jsp
    • -0
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +153
    /lams_central/src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
    • -1
    • +21
    /lams_central/web/WEB-INF/struts-config.xml
    • -0
    • +50
    /lams_central/web/policyConsents.jsp
    • -0
    • +68
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml
    • -0
    • +34
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/PolicyConsent.hbm.xml
    • -0
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
  16. … 7 more files in changeset.
Wednesday 30 May 2018
8:19 pm

Marcin Cieslak

LDEV-4587 Remove obsolete action

Options
    • -41
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java
    • -13
    • +0
    /lams_monitoring/web/WEB-INF/struts-config.xml
8:18 pm

Marcin Cieslak

LDEV-4587 Add missing bottom border for complex activity in progress bar

Options
    • -0
    • +1
    /lams_central/web/css/_progressBar_base.scss
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