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
Wednesday 23 Oct 2019
6:43 pm

Marcin Cieslak

LDEV-4745 Fix TBL template Scratchie question adding in authoring

Even if there were RAT multiple questions added, only one showed up in

Scratchie.

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 22 Oct 2019
8:11 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

Options
    • -2
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -3
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +2
    /lams_central/web/qb/search.jsp
    • -2
    • +11
    /lams_central/web/qb/stats.jsp
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -76
    • +336
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -147
    • +377
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Monday 21 Oct 2019
10:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -7
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/util/JsonUtil.java
    • -50
    • +57
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -36
    • +45
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:15 pm

Andrey Balan

Merge branch 'master' into develop

Options
8:12 pm

Andrey Balan

LDEV-4885 Remove all white space characters from preset marks setting

Options
    • -1
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 18 Oct 2019
8:59 pm

Andrey Balan

LDEV-4875 Respect QbQuestion's case sensitive setting

* Simplify learning.jsp, so it gets most of the data from the server

rather than tries to figure it out on a client side

* Optimize the way answers get fetched from Assessment

* Fix the following issue: if there is no activity selected to fetch

assessment answers from, then Scratchie don't show user answers

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -19
    • +20
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -8
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -10
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -70
    • +71
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -34
    • +63
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -64
    • +47
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Thursday 17 Oct 2019
1:13 pm

Marcin Cieslak

Merge branch 'LDEV-4884' into LDEV-4745

Options
1:12 pm

Marcin Cieslak

LDEV-4884 UUIDs in QTI export/import in QB

Options
    • -0
    • +48
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -0
    • +5
    /lams_central/web/questions/questionChoice.jsp
    • -2
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
    • -8
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
    • -13
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
2:28 am

Andrey Balan

LDEV-4875 Take care about answers containing XML escaped characters

Options
    • -4
    • +12
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
Wednesday 16 Oct 2019
7:53 pm

Andrey Balan

Merge branch 'master' into develop

Options
6:59 pm

dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump httpclient from 4.5.2 to 4.5.10 in /3rdParty_sources/basiclti-util

Bumps httpclient from 4.5.2 to 4.5.10.

Signed-off-by: dependabot[bot] <support@github.com>

Options
    • -1
    • +1
    /3rdParty_sources/basiclti-util/pom.xml
6:58 pm

Andrey Balan

LDEV-4883 Fix HttpClient warning “Invalid expires attribute”

Options
    • -1
    • +1
    /3rdParty_sources/basiclti-util/pom.xml
    • -1
    • +4
    /3rdParty_sources/basiclti-util/readme by LAMS.txt
    • -13
    • +20
    /3rdParty_sources/basiclti-util/src/main/java/org/imsglobal/pox/IMSPOXRequest.java
    • binary
    /lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar
3:35 pm

Marcin Cieslak

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

Options
3:30 pm

Marcin Cieslak

LDEV-4813 Improve slow queries

Options
    • -11
    • +14
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
3:06 am

Andrey Balan

Merge branch 'master' into develop

Options
3:05 am

Andrey Balan

LDEV-4882 Check lesson monitor rights correctly

Options
    • -27
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
2:39 am

Andrey Balan

LDEV-4881 Remove notebook entries from DB on lesson removal

Options
    • -9
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
    • -32
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
    • -15
    • +15
    /lams_learning/web/notebook/addnew.jsp
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 15 Oct 2019
10:02 pm

Marcin Cieslak

Merge branch 'LDEV-4845' into LDEV-4745

Options
10:02 pm

Marcin Cieslak

LDEV-4845 LD XML transformation for Q&A tool

Options
    • -0
    • +15
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20190809.sql
    • -0
    • +73
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
    • -2
    • +19
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
6:14 pm

Marcin Cieslak

LDEV-4841 Set QB question content folder ID for new Q&A questions

Options
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -37
    • +42
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -1
    • +1
    /lams_tool_laqa/web/authoring/BasicContent.jsp
6:13 pm

Marcin Cieslak

LDEV-4836 Set QB question content folder ID for new MCQ questions

Also add a default content folder ID to template activities during

migration.

Options
    • -7
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -14
    • +18
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -1
    • +1
    /lams_tool_lamc/web/authoring/candidateAnswersList.jsp
    • -2
    • +3
    /lams_tool_lamc/web/authoring/editQuestionBox.jsp
Monday 14 Oct 2019
6:36 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +3
    /lams_central/web/main.jsp
6:17 pm

Marcin Cieslak

LDEV-4776 Fix a query for fetching Lesson Gradebook data

Options
    • -2
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
5:38 pm

Andrey Balan

LDEV-4873 Revert LAMS copyright label removal

Options
    • -1
    • +5
    /lams_central/web/login.jsp
    • -0
    • +3
    /lams_central/web/main.jsp
Sunday 13 Oct 2019
3:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -2
    • +2
    /lams_central/web/main.jsp
2:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

Options
    • -22
    • +0
    /lams_central/web/css/bootstrap-tour.min.css
    • -0
    • +25
    /lams_central/web/css/bootstrap-tourist.min.css
    • -22
    • +0
    /lams_central/web/includes/javascript/bootstrap-tour.min.js
    • -0
    • +12
    /lams_central/web/includes/javascript/bootstrap-tourist.min.js
    • -2
    • +2
    /lams_central/web/main.jsp
    • -3
    • +2
    /lams_central/web/mainTour.jsp
    • -2
    • +2
    /lams_monitoring/web/monitor.jsp
    • -32
    • +42
    /lams_monitoring/web/monitorTour.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/sequence.jsp
Saturday 12 Oct 2019
4:46 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +0
    /lams_central/web/main.jsp
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -1
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -102
    • +48
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
4:42 am

Andrey Balan

LDEV-4873 Remove version numbering from login and main pages

And add it instead to sysadmin.jsp

Options
    • -16
    • +27
    /lams_admin/web/sysadmin.jsp
    • -11
    • +4
    /lams_central/web/login.jsp
    • -6
    • +0
    /lams_central/web/main.jsp
4:07 am

Andrey Balan

LDEV-4877 Upgrade bootstrap library to version 3.4.1

* bootstrap-slider to 10.6.2

* bootstrap-tour to 0.12.0

Options
    • -12
    • +3
    /lams_central/web/css/bootstrap-slider.css
    • -2
    • +2
    /lams_central/web/css/bootstrap-tour.min.css
    • -3
    • +3
    /lams_central/web/css/bootstrap.min.css
    • -3
    • +3
    /lams_central/web/includes/javascript/bootstrap-slider.js
    • -2
    • +2
    /lams_central/web/includes/javascript/bootstrap-tour.min.js
    • -4
    • +3
    /lams_central/web/includes/javascript/bootstrap.min.js
2:25 am

Andrey Balan

LDEV-4878 Sanitise XSS for notes title in learner

Options
    • -38
    • +27
    /lams_learning/web/notebook/addnew.jsp
    • -41
    • +21
    /lams_learning/web/notebook/view.jsp
    • -31
    • +19
    /lams_learning/web/notebook/viewall.jsp
    • -16
    • +13
    /lams_learning/web/notebook/viewalljournals.jsp