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 03 May 2018
12:57 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4561 Edit notebook after learners have started activity.

Also fixed some bugs with the teachers comment field to ensure

emojis are displayed and to avoid injection issues.

Options
    • -4
    • +4
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
    • -10
    • +8
    /lams_tool_notebook/web/pages/monitoring/editActivity.jsp
    • -5
    • +4
    /lams_tool_notebook/web/pages/monitoring/summary.jsp
10:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4573 Spinner indicates busy and no data found message added.

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -11
    • +12
    /lams_admin/web/logevent.jsp
    • -1
    • +40
    /lams_central/web/css/_learner_base.scss
1:51 am

Andrey Balan

LDEV-4557 Fix Upload image dialog

Options
    • -0
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
Wednesday 02 May 2018
6:52 am

Andrey Balan

LDEV-4572 #sequenceCanvas' height should always remain as 'auto'

It should prevent cases when browser deliberately changes its

height to a smaller value which is not enough to display svg.

Options
    • -0
    • +3
    /lams_monitoring/web/tblmonitor/sequence.jsp
6:23 am

Andrey Balan

LDEV-4570 Properly implementing refresh the page feature

After refreshing the page (either by cmd+R or Refresh button) it

should refresh currently opened tab and not "sequence" one as it

used to be.

Options
    • -18
    • +19
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
1:38 am

Marcin Cieslak

Merge branch 'LDEV-4571'

Options
1:37 am

Marcin Cieslak

LDEV-4571 Allow (de)selecting all users for org password change

Options
    • -16
    • +46
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -0
    • +2
    /lams_admin/web/WEB-INF/struts-config.xml
    • -32
    • +99
    /lams_admin/web/orgPasswordChange.jsp
Tuesday 01 May 2018
9:33 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4565 Adding column name for Remarks column in Event Log

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_admin/web/logevent.jsp
9:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -2
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
5:11 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java
5:09 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
2:25 pm

Marcin Cieslak

Merge branch 'LDEV-4562'

Options
2:25 pm

Marcin Cieslak

LDEV-4562 Log password change of all course participants

Options
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
2:10 pm

Marcin Cieslak

LDEV-4562 Refresh update date on user password change

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
11:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4560 Improved Audit message for force complete

Options
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +20
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
5:02 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569 TBL UI: adjustments

minor adjustments to .courses-title

Options
    • -1
    • +3
    /lams_monitoring/web/css/_tblmonitor_base.scss
3:36 am

Andrey Balan

Merge branch 'LDEV-4569'

Options
3:35 am

Andrey Balan

LDEV-4569 TBL UI: adjustments

* wrap lesson's name

* revice the LAMS logo at the top left corner

* Make TBL monitor to follow themes

* AEs' tab title is "AEs Questions & Marks" now

Options
    • -0
    • +404
    /lams_monitoring/web/css/_tblmonitor_base.scss
    • -0
    • +2
    /lams_monitoring/web/css/defaultHTML_tblmonitor.scss
    • -0
    • +2
    /lams_monitoring/web/css/purple_tblmonitor.scss
    • -407
    • +0
    /lams_monitoring/web/css/tblmonitor.scss
    • -6
    • +4
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
Monday 30 Apr 2018
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180525.sql
    • -0
    • +26
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180525.sql
    • -0
    • +17
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20180525.sql
    • -0
    • +15
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20180525.sql
    • -0
    • +17
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180525.sql
    • -0
    • +16
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20180525.sql
    • -0
    • +15
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20180525.sql
    • -0
    • +16
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20180525.sql
    • -0
    • +18
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180525.sql
    • -0
    • +19
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180525.sql
    • -0
    • +16
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180525.sql
    • -0
    • +15
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20180525.sql
    • -0
    • +15
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20180525.sql
    • -0
    • +17
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180525.sql
    • -0
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180525.sql
  16. … 14 more files in changeset.
10:47 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4566: add reference to questions in burning questions

Adding underline to burning question titles

Options
    • -1
    • +5
    /lams_tool_scratchie/web/includes/css/scratchie.scss
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/results.jsp
Saturday 28 Apr 2018
6:18 am

Andrey Balan

LDEV-4568 Change burning question's "+" icon to "-" on expanding

Options
    • -0
    • +6
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -2
    • +4
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -2
    • +4
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
5:04 am

Andrey Balan

LDEV-4567 Skip adding users to grouping if they don't belong to the org

Options
    • -0
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
Friday 27 Apr 2018
2:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4510: change groups to teams

Options
    • -1
    • +1
    /lams_www/web/public/ld-templates/tbl/tblintro.html
    • -1
    • +1
    /lams_www/web/public/ld-templates/tbl/tblintro_en_AU.html
11:27 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4566: add reference to questions in burning questions

Adding an anchor reference so when seeing burning question there's a link to the question.

Options
    • -8
    • +9
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Thursday 26 Apr 2018
9:20 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4556: CKEditor upgrade

Re-adding missing emojione icon

Options
    • binary
    /lams_central/web/ckeditor/plugins/emojione/icons/emojione.png
Wednesday 25 Apr 2018
7:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating Norwegian

Options
    • -3
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
Tuesday 24 Apr 2018
6:01 am

Andrey Balan

LDEV-4563 Prevent adding non lesson learners to groupings

Options
    • -41
    • +57
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
Sunday 22 Apr 2018
9:33 pm

Marcin Cieslak

Merge branch 'LDEV-4540'

Options
6:15 pm

Marcin Cieslak

LDEV-4540 Fix variable name clash when iterating over options

Options
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
Saturday 21 Apr 2018
6:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

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

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -1
    • +1
    /lams_build/conf/slim/standalone.xml
    • -1
    • +1
    /lams_build/conf/standalone.xml
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +160
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +35
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -38
    • +70
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -0
    • +1
    /lams_central/web/login.jsp
    • -10
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -10
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
    • -7
    • +38
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  16. … 6 more files in changeset.