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
Thursday 27 Jul 2017
6:05 pm

Marcin Cieslak

Merge branch 'LDEV-4392'

Options
6:04 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -6
    • +5
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_central/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -10
    • +9
    /lams_learning/web/includes/javascript/presence.js
    • -6
    • +5
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -12
    • +10
    /lams_tool_chat/web/includes/javascript/learning.js
    • -6
    • +5
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -14
    • +42
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -6
    • +5
    /lams_tool_images/web/WEB-INF/tags/Page.tag
  16. … 23 more files in changeset.
Tuesday 25 Jul 2017
8:06 pm

Marcin Cieslak

Merge branch 'LDEV-4392'

Options
8:05 pm

Marcin Cieslak

LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

Options
    • -4
    • +14
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_central/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -5
    • +9
    /lams_learning/web/includes/javascript/presence.js
    • -4
    • +14
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +6
    /lams_tool_chat/web/includes/javascript/learning.js
    • -4
    • +14
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -2
    • +7
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -4
    • +14
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -4
    • +14
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -6
    • +16
    /lams_tool_images/web/WEB-INF/tags/Page.tag
  16. … 23 more files in changeset.
3:45 pm

Marcin Cieslak

Merge branch 'LDEV-4837'

Options
3:42 pm

Marcin Cieslak

LDEV-4837 Fix learner icons positioning

New sequences have optional activities coordinates set correctly. Old

sequences had them set in Flash and they are broken in DB for FLA. SVG

generator can cope with it, now Monitoring too.

The solution uses SVG path instead of DB coordinates.

Options
    • -5
    • +5
    /lams_monitoring/web/includes/javascript/monitorLesson.js
11:23 am

Marcin Cieslak

Merge branch 'LDEV-4389'

Options
11:23 am

Marcin Cieslak

LDEV-4389 Replace a method not supported in IE 11

Options
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
10:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4390 Default style buttons in Purple theme have no blue outline.

Options
    • -0
    • +3
    /lams_central/web/css/purple_learner.scss
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4390 Purple Theme

Options
    • -0
    • +91
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -0
    • +2
    /lams_central/web/css/purple_authoring.scss
    • -0
    • +2
    /lams_central/web/css/purple_chart.scss
    • -0
    • +11
    /lams_central/web/css/purple_jquery.jRating.scss
    • -0
    • +12
    /lams_central/web/css/purple_learner.scss
    • -0
    • +2
    /lams_central/web/css/purple_main.scss
    • -0
    • +2
    /lams_central/web/css/purple_progressBar.scss
    • -0
    • +2
    /lams_central/web/css/purple_treetable.scss
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170720.sql
    • -0
    • +2
    /lams_monitoring/web/css/purple_monitorLesson.scss
1:05 am

Marcin Cieslak

LDEV-4366 Introduce rubrics to Kumalive

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/scss/_bootstrap-variables.scss
    • -0
    • +6
    /lams_central/web/groupHeader.jsp
    • -0
    • +17
    /lams_central/web/includes/javascript/main.js
    • -1
    • +1
    /lams_central/web/includes/javascript/openUrls.js
    • -0
    • +2
    /lams_central/web/main.jsp
    • -4
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170710.sql
    • -3
    • +8
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -0
    • +28
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml
    • -0
    • +26
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
    • -1
    • +5
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -0
    • +102
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -56
    • +118
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
  16. … 15 more files in changeset.
Monday 24 Jul 2017
12:52 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

English, Greek and Norwegian

Options
    • -33
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -33
    • +2
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -33
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -35
    • +4
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Deleted file created accidently for LDEV-3775

Options
    • -91
    • +0
    /lams_tool_forum/web/WEB-INF/tags/ProgressBar.tag
Saturday 22 Jul 2017
5:26 pm

Marcin Cieslak

LDEV-3490 Limit activity title length

Options
    • -7
    • +7
    /lams_central/web/authoring/authoring.jsp
12:21 pm

Marcin Cieslak

LDEV-3490 Fix title breaking in progress bar

The progress bar is not displayed when its elements get created.

Javascript can not predict their dimensions. We need to create a dummy,

visible Snap paper, adjust elements there and only add the final version

to the real paper.

Options
    • -15
    • +23
    /lams_central/web/includes/javascript/progressBar.js
5:16 am

Andrey Balan

Merge branch 'NTU-13'

Options
Friday 21 Jul 2017
11:40 pm

Andrey Balan

NTU-13 Switch log4j to slf4j logging library

As long as Blackboard doesn't cope well with log4j we switched to using

slf4j library. It will log messages to stdout-stderr-xxx.log file.

Options
    • -1
    • +2
    /lams_bb_integration/.classpath
    • -0
    • +7
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +3
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -20
    • +0
    /lams_bb_integration/WEB-INF/config/log4j.properties
    • -1
    • +7
    /lams_bb_integration/build.xml
    • binary
    /lams_bb_integration/lib/log4j-1.2.8.jar
    • binary
    /lams_bb_integration/lib/slf4j-api-1.7.5.jar
    • binary
    /lams_bb_integration/lib/slf4j-simple-1.7.5.jar
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GroupDataServlet.java
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LearnerMonitorServlet.java
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LinkToolsServlet.java
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/OpenLamsPageServlet.java
  16. … 5 more files in changeset.
9:46 am

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

LDEV-4377 - Show timezones to select order alphabetically

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
9:40 am

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

LDEV-4377 - Show timezones to select order alphabetically

Options
    • -288
    • +292
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -0
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/timezone/util/TimezoneIDComparator.java
Thursday 20 Jul 2017
4:29 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4352: adding missing labels

Alright, these should be all now for this JIRA

Options
    • -2
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +9
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
4:13 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4352 & LDEV-4273 updating/adding missing labels

Missed some labels from previous features in i18n. Adding them now

Options
    • -2
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
3:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4352 adding labels from i18n

Adding and modifying labels from i18n

Options
    • -18
    • +17
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -10
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
11:48 am

tkkaung <tkkaung@269-ullbvoh17.staff.main.ntu.edu.sg>

LDEV-4376 Option to select all available timezones

Options
    • -1
    • +0
    /lams_admin/web/timezoneManagement.jsp
10:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Removing css files that should now be ignored

Options
    • -7
    • +2
    /lams_central/.gitignore
    • -378
    • +0
    /lams_central/web/css/defaultHTML_authoring.css
    • -38
    • +0
    /lams_central/web/css/defaultHTML_chart.css
    • -101
    • +0
    /lams_central/web/css/defaultHTML_jquery.jRating.css
    • -488
    • +0
    /lams_central/web/css/defaultHTML_main.css
    • -107
    • +0
    /lams_central/web/css/defaultHTML_orgGroup.css
    • -60
    • +0
    /lams_central/web/css/defaultHTML_progressBar.css
    • -50
    • +0
    /lams_central/web/css/defaultHTML_treetable.css
Wednesday 19 Jul 2017
6:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +12
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -15
    • +0
    /lams_admin/web/css/learningLibraryGroup.scss
    • -2
    • +2
    /lams_admin/web/includes/javascript/learningLibraryGroup.js
    • -1
    • +1
    /lams_build/common.properties
    • -840
    • +0
    /lams_build/conf/scss/_bootstrap-variables.scss
    • -56
    • +0
    /lams_build/conf/scss/_lams_variables.scss
    • -0
    • +840
    /lams_central/conf/scss/_bootstrap-variables.scss
    • -0
    • +79
    /lams_central/conf/scss/_lams_variables.scss
    • -0
    • +109
    /lams_central/conf/scss/_mixins.scss
    • -10
    • +37
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +12
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    /lams_central/web/addLesson.jsp
    • -1
    • +1
    /lams_central/web/authoring/authoring.jsp
  16. … 142 more files in changeset.
4:34 pm

tkkaung <tkkaung@269-ullbvoh17.staff.main.ntu.edu.sg>

LDEV-4376 Option to select all available timezones

Options
    • -2
    • +2
    /lams_admin/web/timezoneManagement.jsp
3:41 pm

tkkaung <tkkaung@269-ullbvoh17.staff.main.ntu.edu.sg>

LDEV-4376 Option to select all available timezones

Options
    • -2
    • +2
    /lams_admin/web/timezoneManagement.jsp
3:25 pm

tkkaung <tkkaung@269-ullbvoh17.staff.main.ntu.edu.sg>

LDEV-4376 Option to select all available timezones

Options
    • -5
    • +24
    /lams_admin/web/timezoneManagement.jsp
4:13 am

Andrey Balan

Merge branch 'LDEV-4386'

Options
4:11 am

Andrey Balan

LDEV-4386 Prevent showing questions not selected in que. list in monitor

All questions in question bank -even when not selected, show in monitor.

We should show only the ones added to question list or all of them in

case there is at least one random question available

Options
    • -0
    • +44
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentResultDTO.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -29
    • +63
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -7
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java