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 20 Jul 2017
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
3:58 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4375: upgrading LAMS logo

A new sharper logo without the lighthouse

Options
    • binary
    /lams_bb_integration/web/includes/images/logo.gif
3:19 am

Marcin Cieslak

Merge branch 'LDEV-4382'

Options
3:18 am

Marcin Cieslak

LDEV-4382 Allow NULL group UIID in Live Edit

Having NULL group UIID seems like a common situation. There is even an

old comment explaining why is that. Object extractor should be ready for

such situation.

Options
    • -1691
    • +1691
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
Tuesday 18 Jul 2017
5:27 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4385: colours for assessment feedback

Depict the tick in green and the cross in red.

Options
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/markhedging.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/matchingpairs.jsp
    • -8
    • +7
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/numerical.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/ordering.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/shortanswer.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/results/truefalse.jsp
2:50 pm

Ernie Ghiglione <ernieg@gmail.com>

Merge branch 'master' of https://github.com/lamsfoundation/lams

Options
2:50 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4384: Updating labels

Add 2 remove 1

Options
    • -3
    • +4
    /lams_tool_leader/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
2:25 pm

Andrey Balan

Merge branch 'LDEV-4375'

Options
2:24 pm

Andrey Balan

LDEV-4375 Increase building block version number to 1.2.21

Options
    • -0
    • +3
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
2:01 pm

Marcin Cieslak

LDEV-4366 Send ping every few idle minutes

Options
    • -1
    • +34
    /lams_learning/web/includes/javascript/kumalive.js
1:38 pm

Marcin Cieslak

Merge branch 'LDEV-4382'

Options
1:31 pm

Marcin Cieslak

LDEV-4382 Fix JS data flow for Live Edit

Options
    • -2886
    • +2889
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
1:28 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4384: emphasise leader selection message to learners

If leader has not yet been selected, display the message in bold letters so action by the leader can be taken.

Options
    • -1
    • +2
    /lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    /lams_tool_leader/web/pages/learning/leaderselection.jsp
12:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4383: Gates title are not displayed to learners

Forgot to remove c tag from file

Options
    • -1
    • +0
    /lams_learning/web/gate/permissionGateContent.jsp
12:54 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4383: Gates title are not displayed to learners

Adding gates description to a separate jsp and then include it to all gate types

Options
    • -4
    • +4
    /lams_learning/web/gate/conditionGateContent.jsp
    • -0
    • +15
    /lams_learning/web/gate/gateDescription.jsp
    • -3
    • +3
    /lams_learning/web/gate/permissionGateContent.jsp
    • -4
    • +2
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -3
    • +1
    /lams_learning/web/gate/synchGateContent.jsp
10:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4371: label typo

Small label typo fix

Options
    • -2
    • +2
    /lams_tool_forum/web/jsps/admin/config.jsp
3:36 am

Andrey Balan

Merge branch 'LDEV-4375'

Options
3:35 am

Andrey Balan

LDEV-4375 Prevent IE from printing "false" in the background

IE forces background page to become blank and contain "false" word on

opening monitor interface. It happens due to function

openMonitor(courseId, lsid) returns false at the end.

Options
    • -0
    • +2
    /lams_bb_integration/.gitignore
    • -0
    • +1
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -4
    • +0
    /lams_bb_integration/web/includes/javascript/openLamsPage.js
1:46 am

Marcin Cieslak

LDEV-3115 Fix a bug in branching type setting

Grouping was not cleared when branching was set from group-based to any

other.

Options
    • -1908
    • +1909
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
Monday 17 Jul 2017
2:02 pm

Marcin Cieslak

LDEV-4195 Fix class cast exception

Input for assigning course groups to lesson groups can be either

grouping or branching. We need to detect both situations, otherwise we

get class cast exceptions.

Also adjust layout.

Options
    • -676
    • +672
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -0
    • +5
    /lams_central/web/css/authoring.scss
    • -1
    • +4
    /lams_central/web/css/orgGrouping.scss
Thursday 13 Jul 2017
2:38 pm

Marcin Cieslak

Merge branch 'LDEV-4379'

Options
2:37 pm

Marcin Cieslak

LDEV-4379 Fix Assessment answers ordering

Assessment questions are numbered from 1, answers from 0. QTI import

method used 1 for both.

Options
    • -2168
    • +2168
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
2:23 pm

Marcin Cieslak

LDEV-4379 Do not filter out duplicate questions in MCQ

Code was checking if the question being added does not have the same

text as an existing. This feature was removed as answers can be

different.

Options
    • -28
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
    • -52
    • +40
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
1:55 pm

Marcin Cieslak

LDEV-4379 Use correct logger in McAction

Options
    • -8
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java