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
Monday 17 Jun 2019
9:26 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4826

Options
    • -13
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -10
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
5:25 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
5:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Pictures in Questions in QTI File import successfully

Options
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
9:57 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -14
    • +16
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -14
    • +18
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
9:49 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Wording tweaks and tool tips added to templates

Options
    • -14
    • +16
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -14
    • +18
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -3
    • +10
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • binary
    /lams_www/web/public/ld-templates/tbl/tbl.png
    • -4
    • +4
    /lams_www/web/public/ld-templates/tbl/tblintro.html
    • -4
    • +4
    /lams_www/web/public/ld-templates/tbl/tblintro_en_AU.html
12:04 am

Marcin Cieslak

LDEV-4828 Allow adding a question to a collection from its stats page

Options
    • -16
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +20
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +34
    /lams_central/web/qb/stats.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Sunday 16 Jun 2019
11:21 pm

Marcin Cieslak

LDEV-4828 Prevent question removal from last collection

If a question is in its last collection, it gets permanently removed.

Unless it is used in Learning Designs - then the user gets a message

that the question could not be removed.

Options
    • -3
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -12
    • +21
    /lams_central/web/qb/collection.jsp
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -2
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -4
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Friday 14 Jun 2019
1:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

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

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

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

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

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +26
    /lams_central/build.xml
    • -7
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -5
    • +31
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    /lams_central/web/addLesson.jsp
    • -12
    • +12
    /lams_central/web/authoring/authoring.jsp
    • -14
    • +59
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -5
    • +30
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -5
    • +5
    /lams_central/web/authoring/template/tool/assessoption.jsp
    • -8
    • +1
    /lams_central/web/authoring/template/tool/mcoption.jsp
    • -25
    • +73
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -6
    • +34
    /lams_central/web/css/_authoring_base.scss
    • -1
    • +13
    /lams_central/web/css/_learner_base.scss
    • -15
    • +22
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +14
    /lams_central/web/includes/javascript/dialog.js
  16. … 80 more files in changeset.
11:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -8
    • +12
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -8
    • +10
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +34
    /lams_central/web/css/_authoring_base.scss
Thursday 13 Jun 2019
5:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 QTI Import window appears centered on screen.

Options
    • -1
    • +3
    /lams_central/web/authoring/template/comms.jsp
11:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4829' Improvements to TBL template

Options
11:15 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Fixed incompatibility between x-editable and jquery-validation

Options
    • -0
    • +20
    /lams_central/web/authoring/template/comms.jsp
    • -14
    • +5
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -12
    • +3
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -19
    • +10
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -19
    • +11
    /lams_central/web/authoring/template/tool/mcquestion.jsp
9:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Application Exercise functionality completed, can edit titles

Options
    • -2
    • +2
    /lams_central/build.properties
    • -6
    • +10
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +8
    /lams_central/conf/language/lams/TBLResources.properties
    • -4
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -52
    • +80
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -10
    • +9
    /lams_central/web/authoring/template/comms.jsp
    • -19
    • +45
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -39
    • +16
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -6
    • +34
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -6
    • +34
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -2
    • +38
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -6
    • +34
    /lams_central/web/css/_authoring_base.scss
    • binary
    /lams_www/web/public/ld-templates/tbl/tbl.png
    • -3
    • +4
    /lams_www/web/public/ld-templates/tbl/tblintro.html
    • -3
    • +4
    /lams_www/web/public/ld-templates/tbl/tblintro_en_AU.html
Sunday 09 Jun 2019
3:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

Options
    • -3
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -8
    • +10
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +15
    /lams_central/conf/language/lams/TBLResources.properties
    • -4
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -14
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -54
    • +136
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -28
    • +36
    /lams_central/web/authoring/template/comms.jsp
    • -0
    • +57
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -21
    • +63
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -14
    • +17
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -5
    • +9
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -2
    • +2
    /lams_central/web/authoring/template/tool/assessmentQTI.jsp
    • -5
    • +5
    /lams_central/web/authoring/template/tool/assessoption.jsp
    • -2
    • +2
    /lams_central/web/authoring/template/tool/assessredooption.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/tool/mcquestionQTI.jsp
Friday 07 Jun 2019
2:33 am

Marcin Cieslak

Merge branch 'LDEV-4828' into LDEV-4745

Options
2:31 am

Marcin Cieslak

LDEV-4746 Update question with richer data from other tool

Options
    • -555
    • +618
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Thursday 06 Jun 2019
5:42 pm

Marcin Cieslak

LDEV-4828 Rewrite layout to bootstrap grid. Add comments. Minor fixes.

Options
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -66
    • +115
    /lams_central/web/qb/collection.jsp
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:31 pm

Marcin Cieslak

LDEV-4828 Allow collection unsharing on QB collections page

Options
    • -0
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +24
    /lams_central/web/qb/collection.jsp
4:23 pm

Marcin Cieslak

LDEV-4828 Allow question copy and collection sharing in QB

Options
    • -2
    • +12
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -3
    • +45
    /lams_central/web/qb/collection.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -6
    • +60
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
3:31 pm

Marcin Cieslak

LDEV-4828 Add "Remove collection" button to QB collections page

Options
    • -7
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -26
    • +52
    /lams_central/web/qb/collection.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
12:14 am

Marcin Cieslak

LDEV-4828 Add "Add question" button to QB collections page

Options
    • -1
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +52
    /lams_central/web/qb/collection.jsp
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -8
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 05 Jun 2019
11:12 pm

Marcin Cieslak

LDEV-4828 Add "Add collection" button on QB collection page

Options
    • -0
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +45
    /lams_central/web/qb/collection.jsp
10:17 pm

Marcin Cieslak

LDEV-4828 Add remove button to QB collections

Options
    • -0
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -33
    • +41
    /lams_central/web/qb/collection.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
8:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Activities removable in build, RAT and AE have QTI Import

Options
    • -1
    • +6
    /lams_central/build.properties
    • -0
    • +26
    /lams_central/build.xml
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +4
    /lams_central/conf/language/lams/TBLResources.properties
    • -3
    • +85
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -107
    • +240
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -4
    • +18
    /lams_central/web/authoring/template/comms.jsp
    • -11
    • +72
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -5
    • +28
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -2
    • +4
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -0
    • +29
    /lams_central/web/authoring/template/tool/assessmentQTI.jsp
    • -8
    • +1
    /lams_central/web/authoring/template/tool/mcoption.jsp
    • -23
    • +43
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -0
    • +22
    /lams_central/web/authoring/template/tool/mcquestionQTI.jsp
  16. … 3 more files in changeset.
4:17 pm

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -884
    • +885
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -302
    • +306
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
    • -0
    • +4
    /lams_central/web/includes/javascript/openUrls.js
    • -331
    • +339
    /lams_central/web/main.jsp
3:55 pm

Marcin Cieslak

LDEV-4828 Multiselect in QB collection jqGrid

Options
    • -3
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -5
    • +98
    /lams_central/web/qb/collection.jsp
3:54 pm

Marcin Cieslak

LDEV-4828 Fix displaying HTML options in chart

Options
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
3:52 pm

Marcin Cieslak

LDEV-4828 Fix a CSS link on QB stats page

Options
    • -285
    • +285
    /lams_central/web/qb/stats.jsp
2:56 pm

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -26
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -4
    • +4
    /lams_central/web/qb/collection.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -9
    • +54
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -63
    • +68
    /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
    • -512
    • +538
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -87
    • +83
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -341
    • +318
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -623
    • +623
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
1:12 pm

Marcin Cieslak

LDEV-4828 Initial implementation of QB collections front end

Options
    • -0
    • +151
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +77
    /lams_central/web/qb/collection.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java