lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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 16 Jul 2019
11:21 am

Marcin Cieslak

LDEV-4828 Allow question sorting by usage in lessons on collection page

Options
    • -2
    • +2
    ./web/qb/collection.jsp
  2. … 1 more file in changeset.
10:53 am

Marcin Cieslak

LDEV-4782 Sort lessons by organisation. Include only active lessons.

Options
    • -1
    • +1
    ./web/qb/stats.jsp
  2. … 1 more file in changeset.
10:34 am

Marcin Cieslak

LDEV-4782 Add a link to open lesson monitor on QB stats page

Options
    • -2
    • +11
    ./web/qb/stats.jsp
10:18 am

Marcin Cieslak

LDEV-4828 Fix encoding when sending XML with jqGrid collection data

Options
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
Monday 15 Jul 2019
5:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
5:34 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4837 Removing white line that appears on iPad partway down dialog

Options
    • -1
    • +0
    ./web/css/_learner_base.scss
Sunday 14 Jul 2019
2:43 pm

Marcin Cieslak

LDEV-4834 Fetch outcomes using DAO instead of entity relationship

Various question versions share same outcomes. Hibernate does not like

having same collection bound to two entity instances, though, even if

the collection is read-only. In this case we get rid of the collection

and just fetch it using DAO. It probably is a better solution anyway.

Options
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
  2. … 1 more file in changeset.
Saturday 13 Jul 2019
10:00 am

Marcin Cieslak

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

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

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

Options
    • -29
    • +40
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -254
    • +253
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -526
    • +566
    ./web/qb/collection.jsp
    • -461
    • +503
    ./web/qb/stats.jsp
  5. … 7 more files in changeset.
9:18 am

Andrey Balan

LDEV-4836 Fix autopatch script

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 1 more file in changeset.
1:44 am

Andrey Balan

LDEV-4836 Properly assign collections

Options
    • -19
    • +20
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +1
    ./web/qb/authoring/addQuestionFooter.jsp
    • -2
    • +3
    ./web/qb/authoring/addessay.jsp
    • -2
    • +3
    ./web/qb/authoring/addmarkhedging.jsp
    • -2
    • +3
    ./web/qb/authoring/addmatchingpairs.jsp
    • -2
    • +3
    ./web/qb/authoring/addmultiplechoice.jsp
    • -2
    • +3
    ./web/qb/authoring/addnumerical.jsp
    • -2
    • +3
    ./web/qb/authoring/addordering.jsp
    • -2
    • +3
    ./web/qb/authoring/addshortanswer.jsp
    • -2
    • +3
    ./web/qb/authoring/addtruefalse.jsp
    • -0
    • +2
    ./web/qb/searchWidget.jsp
  13. … 3 more files in changeset.
12:10 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
    • -54
    • +35
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -35
    • +89
    ./web/qb/collection.jsp
    • -4
    • +7
    ./web/qb/stats.jsp
  5. … 4 more files in changeset.
Friday 12 Jul 2019
11:21 pm

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -0
    • +67
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -104
    • +472
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -0
    • +6
    ./web/common/taglibs.jsp
    • -0
    • +7
    ./web/css/bootstrap-toggle.css
    • -0
    • +28
    ./web/css/bootstrap-toggle.scss
    • -0
    • +1
    ./web/css/qb-question.css
    • -0
    • +394
    ./web/css/qb-question.scss
    • -0
    • +9
    ./web/includes/javascript/bootstrap-toggle.js
    • -0
    • +135
    ./web/includes/javascript/qb-option.js
    • -0
    • +80
    ./web/includes/javascript/qb-question.js
    • -0
    • +29
    ./web/qb/authoring/addQuestionFooter.jsp
    • -0
    • +28
    ./web/qb/authoring/addQuestionHeader.jsp
    • -0
    • +231
    ./web/qb/authoring/addessay.jsp
  16. … 62 more files in changeset.
Wednesday 10 Jul 2019
7:28 pm

Marcin Cieslak

LDEV-4834 Check if user can manage a QB question

If an user does not have access to a question, i.e. it is not in any

collection he/she sees, then prevent him/her from editing the question's

collections and learning outcomes.

Options
    • -32
    • +2
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -86
    • +107
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -4
    • +43
    ./web/qb/stats.jsp
  4. … 5 more files in changeset.
Saturday 06 Jul 2019
9:28 am

Marcin Cieslak

LDEV-4828, LDEV-4834 Move management sections to bottom of stats page

Options
    • -54
    • +55
    ./web/qb/stats.jsp
Thursday 04 Jul 2019
7:27 pm

Marcin Cieslak

LDEV-4834 Show Learning Outcomes in single QB collection view

Options
    • -254
    • +253
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -526
    • +566
    ./web/qb/collection.jsp
    • -179
    • +181
    ./web/qb/collectionList.jsp
  4. … 1 more file in changeset.
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -913
    • +914
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +13
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -644
    • +675
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -461
    • +463
    ./web/qb/stats.jsp
  6. … 46 more files in changeset.
2:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Supports multiple response app ex, improved font on TRA chart

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/AssessMCAnswer.java
    • -8
    • +20
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -30
    • +86
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +2
    ./web/authoring/template/tbl/appex.jsp
    • -4
    • +19
    ./web/authoring/template/tool/assessmcq.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessment.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessmentQTI.jsp
    • -2
    • +2
    ./web/authoring/template/tool/mcquestion.jsp
  12. … 1 more file in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -29
    • +57
    ./conf/language/lams/ApplicationResources.properties
    • -29
    • +40
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +1
    ./web/includes/javascript/ckconfig_custom.js
  4. … 52 more files in changeset.
Tuesday 02 Jul 2019
3:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
  6. … 10 more files in changeset.
3:19 pm

Marcin Cieslak

LDEV-4828 Add subgrid with previous versions in QB collection view

Options
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -6
    • +55
    ./web/qb/collection.jsp
  3. … 3 more files in changeset.
10:48 am

Marcin Cieslak

LDEV-4828 Rewrite QB collections to use question ID instead of uid

Options
    • -32
    • +35
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -22
    • +18
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -6
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -22
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -1
    • +1
    ./web/qb/collection.jsp
    • -4
    • +7
    ./web/qb/stats.jsp
  8. … 5 more files in changeset.
Sunday 30 Jun 2019
12:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -12
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +17
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +15
    ./web/css/_authoring_base.scss
12:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Cosmetic button changes, Assessment questions not numbered

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -4
    • +5
    ./web/authoring/template/tbl/appex.jsp
    • -5
    • +3
    ./web/authoring/template/tbl/tbl.jsp
    • -3
    • +3
    ./web/authoring/template/tool/assessmcq.jsp
    • -2
    • +2
    ./web/authoring/template/tool/assessment.jsp
    • -2
    • +3
    ./web/authoring/template/tool/mcquestion.jsp
    • -5
    • +15
    ./web/css/_authoring_base.scss
8:34 am

Marcin Cieslak

LDEV-4828 Prevent public collection's name from being changed

Options
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -28
    • +33
    ./web/qb/collection.jsp
Saturday 29 Jun 2019
2:43 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Marks for iRA, tRa and AE go to Gradebook

Options
    • -3
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
Friday 28 Jun 2019
10:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +33
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -0
    • +14
    ./web/authoring/template/comms.jsp
    • -0
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessmcq.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessment.jsp
    • -0
    • +1
    ./web/authoring/template/tool/mcquestion.jsp
Thursday 27 Jun 2019
2:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Error msg and text improvements, supports mark entry

Options
    • -12
    • +14
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +15
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./conf/language/lams/TBLResources.properties
    • -21
    • +27
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -11
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/template/SurveyQuestion.java
    • -10
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/template/TemplateData.java
    • -7
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -34
    • +63
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -2
    • +2
    ./web/authoring/template/groupingerrors.jsp
    • -3
    • +3
    ./web/authoring/template/tbl/tbl.jsp
    • -0
    • +3
    ./web/authoring/template/tool/assessmcq.jsp
    • -0
    • +4
    ./web/authoring/template/tool/assessment.jsp
    • -1
    • +1
    ./web/authoring/template/tool/mcquestion.jsp
  14. … 1 more file in changeset.
Wednesday 26 Jun 2019
7:54 pm

Andrey Balan

LDEV-3997 Try to fetch user name from lis_person_name_full parameter

Options
    • -6
    • +23
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Tuesday 25 Jun 2019
7:09 pm

Andrey Balan

LDEV-4833 Move import/export questions in XML format feature to QB

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +188
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -0
    • +22
    ./web/qb/collection.jsp
    • -0
    • +106
    ./web/qb/importQuestionsXml.jsp
  5. … 4 more files in changeset.
Monday 24 Jun 2019
9:48 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +99
    ./conf/language/lams/ApplicationResources_el_GR.properties