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
Tuesday 01 May 2018
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.
7:03 am

Andrey Balan

Merge branch 'LDEV-4556'

Options
7:00 am

Andrey Balan

LDEV-4556 Remove PasteFromWord button

There is no point in showing it as it shows only warning message

when pressed

Options
    • -10
    • +8
    /lams_central/web/includes/javascript/ckconfig_custom.js
6:58 am

Andrey Balan

LDEV-4556 Upgrade CKEditor to the latest version 4.9.2

Options
    • -1358
    • +1483
    /lams_central/web/ckeditor/CHANGES.md
    • -1420
    • +1420
    /lams_central/web/ckeditor/LICENSE.md
    • -2
    • +2
    /lams_central/web/ckeditor/adapters/jquery.js
    • -724
    • +800
    /lams_central/web/ckeditor/ckeditor.js
    • -208
    • +207
    /lams_central/web/ckeditor/contents.css
    • -2
    • +2
    /lams_central/web/ckeditor/lang/ar.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/bg.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/ca.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/cs.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/cy.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/da.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/de.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/el.js
    • -2
    • +2
    /lams_central/web/ckeditor/lang/en-au.js
    • -0
    • +5
    /lams_central/web/ckeditor/lang/en.js
  16. … 224 more files in changeset.
6:44 am

Andrey Balan

LDEV-4556 Create list of all LAMS Customizations

/ckeditor/README.md ("## LAMS Customizations" section) contains

now all customizations of the original CKEditor code done by LAMS.

Next time we do any customizations of CKEditor, it should also

be noted there. It will make future upgrades of CKEditor easier.

Options
    • -22
    • +150
    /lams_central/web/ckeditor/README.md
6:41 am

Andrey Balan

LDEV-4556 update /ckeditor/build-config.js

Make sure /ckeditor/build-config.js contains uptodate settings

which can be used next time to download CKEditor using builder

Options
    • -46
    • +6
    /lams_central/web/ckeditor/build-config.js
Thursday 19 Apr 2018
1:49 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4555 Improved data sending (POST, reduce data sent)

Options
    • -11
    • +27
    /lams_central/web/authoring/template/comms.jsp
Tuesday 17 Apr 2018
6:13 pm

Marcin Cieslak

LDEV-4540 Prevent non-leader Assessments from using answer disclosing

Options
    • -0
    • +5
    /lams_tool_assessment/web/pages/authoring/advance.jsp
Monday 16 Apr 2018
7:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 All assessment questions in one Application Exercise

Options
    • -21
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
2:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 Template TBL Assessment offers multiple choice

Options
    • -1
    • +8
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +156
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +33
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -19
    • +61
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +4
    /lams_central/web/WEB-INF/struts-config.xml
    • -8
    • +46
    /lams_central/web/authoring/template/comms.jsp
    • -2
    • +2
    /lams_central/web/authoring/template/grouping.jsp
    • -8
    • +4
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -0
    • +50
    /lams_central/web/authoring/template/tool/assessgradeselector.jsp
    • -0
    • +66
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -5
    • +13
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -0
    • +36
    /lams_central/web/authoring/template/tool/assessoption.jsp
    • -0
    • +14
    /lams_central/web/authoring/template/tool/assessredooption.jsp
    • -2
    • +6
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -2
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 13 Apr 2018
3:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4554 Completed optional activities are now links to revisit.

Options
    • -0
    • +5
    /lams_central/web/css/_learner_base.scss
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +3
    /lams_learning/web/optionsActivity.jsp
12:02 pm

Marcin Cieslak

LDEV-4545 Skip gates in a TBL sequence

Options
    • -6
    • +14
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
6:52 am

Andrey Balan

LDEV-4540 Allow non-leaders see results page together with leader

Previously non-leader could see the results page only when the

leader goes to the next activity. If the leader is still on the

results page, a non-leader still sees the read-only questions page.

This way working with answer disclosing was pretty much

impossible so we allowed non-leaders see results page

simultaneously with leader.

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Thursday 12 Apr 2018
7:41 pm

Marcin Cieslak

Merge branch 'LDEV-4548'

Options
7:41 pm

Marcin Cieslak

LDEV-4548 Disable login button after clicking

Options
    • -0
    • +1
    /lams_central/web/login.jsp
    • -0
    • +1
    /lams_central/web/loginTwoFactorAuth.jsp