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 19 Mar 2019
4:34 pm

Marcin Cieslak

Merge branch 'LDEV-4731'

Options
1:57 am

Andrey Balan

Merge branch 'LDEV-4765' into LDEV-4777

Options
    • -73
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
Friday 15 Mar 2019
10:32 pm

Andrey Balan

Merge branch 'LDEV-4789' into develop

Options
10:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

Options
    • -8
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
10:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

Options
    • -8
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
Thursday 14 Mar 2019
5:45 pm

Marcin Cieslak

LDEV-4782 Display no data as "-" rather than 0% in QB stats

Also display lesson and activity IDs as tooltips for debugging.

Options
    • -3
    • +10
    /lams_central/web/qb/stats.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 13 Mar 2019
9:26 pm

Marcin Cieslak

Merge branch 'LDEV-4788' into develop

Options
9:20 pm

Marcin Cieslak

LDEV-4788 All learning outcomes are now global

Options
    • -6
    • +0
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -226
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -9
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java
    • -9
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeScaleForm.java
    • -0
    • +1
    /lams_central/web/WEB-INF/web.xml
    • -4
    • +3
    /lams_central/web/includes/javascript/main.js
    • -9
    • +8
    /lams_central/web/includes/javascript/outcome.js
    • -3
    • +1
    /lams_central/web/main.jsp
    • -39
    • +10
    /lams_central/web/outcome/outcomeEdit.jsp
    • -48
    • +21
    /lams_central/web/outcome/outcomeManage.jsp
    • -21
    • +7
    /lams_central/web/outcome/scaleEdit.jsp
    • -32
    • +16
    /lams_central/web/outcome/scaleManage.jsp
  16. … 7 more files in changeset.
7:39 pm

Marcin Cieslak

Merge branch 'LDEV-4787' into develop

Options
7:38 pm

Marcin Cieslak

LDEV-4787 Fix incorrect spacing when copying activities in authoring

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
7:22 pm

Marcin Cieslak

Merge branch 'LDEV-4786' into develop

Options
6:13 am

Andrey Balan

LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

Options
    • -0
    • +9
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -52
    • +38
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/SearchQBController.java
    • -3
    • +31
    /lams_central/web/qb/qbQuestionDetails.jsp
    • -35
    • +103
    /lams_central/web/qb/search.jsp
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +54
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -1
    • +62
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -0
    • +17
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
    • -4
    • +49
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -8
    • +10
    /lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
    • -2
    • +3
    /lams_tool_laqa/web/authoring/BasicContent.jsp
    • -5
    • +24
    /lams_tool_laqa/web/authoring/itemlist.jsp
Tuesday 12 Mar 2019
10:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -20
    • +69
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -2
    • +18
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -9
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -17
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
  16. … 49 more files in changeset.
Friday 08 Mar 2019
7:27 pm

Marcin Cieslak

LDEV-4782 Allow questions' and options' HTML content in QB stats

Options
    • -4
    • +4
    /lams_central/web/qb/stats.jsp
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
7:19 pm

Marcin Cieslak

LDEV-4782 Calculate correct answer average for each activity

Options
    • -12
    • +10
    /lams_central/web/qb/stats.jsp
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -3
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -3
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbStatsDTO.java
    • -4
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
5:11 am

Andrey Balan

LDEV-4751 Fix the issue of CKEditor not opening properly sometimes

(cherry picked from commit e7ead50c9d81d481127f232f4851c0cd56047639)

Options
    • binary
    /lams_central/web/ckeditor/plugins/bootstrapTabs/icons/bootstrapTabs.png
    • -5
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
5:11 am

Andrey Balan

LDEV-4751 Fix the issue of CKEditor not opening properly sometimes

Options
    • binary
    /lams_central/web/ckeditor/plugins/bootstrapTabs/icons/bootstrapTabs.png
    • -5
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
Thursday 07 Mar 2019
6:09 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
5:45 pm

Marcin Cieslak

Merge branch 'LDEV-4785'

Options
5:45 pm

Marcin Cieslak

LDEV-4785 Fix a reference to incorrect form when displaying description

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
4:29 pm

Marcin Cieslak

Merge branch 'LDEV-4746' into LDEV-4782

Options
Wednesday 06 Mar 2019
11:53 pm

Andrey Balan

Merge branch 'LDEV-4784' into develop

Options
11:50 pm

Andrey Balan

LDEV-4784 Update POI library to 4.0.1 version

Options
    • -1
    • +5
    /lams_admin/.classpath
    • -4
    • +5
    /lams_build/3rdParty.userlibraries
    • -0
    • +7
    /lams_build/build.xml
    • binary
    /lams_build/lib/apache-poi/commons-compress-1.18.jar
    • -0
    • +34
    /lams_build/lib/apache-poi/compress.module.xml
    • binary
    /lams_build/lib/apache-poi/poi-3.17.jar
    • binary
    /lams_build/lib/apache-poi/poi-4.0.1.jar
    • binary
    /lams_build/lib/apache-poi/poi-ooxml-3.17.jar
    • binary
    /lams_build/lib/apache-poi/poi-ooxml-4.0.1.jar
    • binary
    /lams_build/lib/apache-poi/poi-ooxml-schemas-3.17.jar
    • binary
    /lams_build/lib/apache-poi/poi-ooxml-schemas-4.0.1.jar
    • -3
    • +4
    /lams_build/lib/apache-poi/poi.module.xml
    • binary
    /lams_build/lib/apache-poi/xmlbeans-2.6.0.jar
    • binary
    /lams_build/lib/apache-poi/xmlbeans-3.0.2.jar
    • -1
    • +1
    /lams_build/lib/apache-poi/xmlbeans.module.xml
    • -7
    • +8
    /lams_build/liblist.txt
5:39 pm

Marcin Cieslak

LDEV-4755 Fix files with zero length being uploaded after viruse scan

Antivirus scan read the stream so it would be at its end when file got

written to drive.

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -21
    • +26
    /lams_contentrepository/.classpath
    • -1
    • +8
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java
4:52 pm

Marcin Cieslak

LDEV-4746 Fix conversion script to address old DB inconsistency

Options
    • -16
    • +45
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Tuesday 05 Mar 2019
4:42 am

Andrey Balan

Merge branch 'master' into develop

Options
4:39 am

Andrey Balan

LDEV-4781 Continue fixing IE 11 bug

Options
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/image2/dialogs/image2.js
Monday 04 Mar 2019
5:26 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
5:24 pm

Marcin Cieslak

LDEV-4440 Fix URL to gradebook previous attempts

Options
    • -2
    • +2
    /lams_gradebook/web/gradebookMonitor.jsp
Thursday 28 Feb 2019
3:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

Options
    • -3
    • +2
    /lams_admin/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_central/web/WEB-INF/tags/FileUpload.tag
    • -59
    • +50
    /lams_central/web/css/_learner_base.scss
    • -2
    • +1
    /lams_central/web/css/defaultHTML_learner.scss
    • -3
    • +2
    /lams_gradebook/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_learning/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_monitoring/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_chat/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_daco/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_doku/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_forum/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_images/web/WEB-INF/tags/FileUpload.tag
    • -3
    • +2
    /lams_tool_imscc/web/WEB-INF/tags/FileUpload.tag
  16. … 20 more files in changeset.