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
Friday 21 Jun 2019
4:47 am

Andrey Balan

LDEV-4826 Add upload/download QTI feature to collection page

Options
    • -4
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -28
    • +70
    /lams_central/web/qb/collection.jsp
    • -39
    • +0
    /lams_central/web/questions/importExport.jsp
3:17 am

Andrey Balan

LDEV-4828 Display question type and version information

Options
    • -27
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +49
    /lams_central/web/qb/collection.jsp
    • -6
    • +10
    /lams_central/web/qb/collectionList.jsp
2:15 am

Andrey Balan

LDEV-4828 Add edit question button

Options
    • -1
    • +33
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -55
    • +82
    /lams_central/web/qb/collection.jsp
1:50 am

Andrey Balan

LDEV-4828 Adjust layout to be closer to the provided mockups

Options
    • -43
    • +46
    /lams_central/web/qb/collection.jsp
    • -18
    • +14
    /lams_central/web/qb/stats.jsp
Thursday 20 Jun 2019
9:53 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4826

Options
7:21 pm

Marcin Cieslak

Merge branch 'LDEV-4828' into LDEV-4745

Options
    • -328
    • +182
    /lams_central/web/qb/collection.jsp
    • -166
    • +315
    /lams_central/web/qb/stats.jsp
    • -3
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -32
    • +98
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
6:38 pm

Marcin Cieslak

LDEV-4828 Adjust layout. Add comments.

Options
    • -25
    • +20
    /lams_central/web/qb/collection.jsp
    • -1
    • +4
    /lams_central/web/qb/collectionList.jsp
    • -26
    • +66
    /lams_central/web/qb/stats.jsp
6:02 pm

Marcin Cieslak

LDEV-4828 Toggle questions transfer and collection creation in sysadmin

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +33
    /lams_central/web/qb/collection.jsp
    • -3
    • +6
    /lams_central/web/qb/collectionList.jsp
    • -2
    • +4
    /lams_central/web/qb/stats.jsp
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190531.sql
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
5:15 pm

Marcin Cieslak

LDEV-4828 Change default private collection name

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
5:12 pm

Marcin Cieslak

LDEV-4828 Allow changing collection name

Options
    • -0
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:11 pm

Marcin Cieslak

LDEV-4828 Show usage in lessons on single collection page

Options
    • -4
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +3
    /lams_central/web/qb/collection.jsp
    • -1
    • +3
    /lams_central/web/qb/collectionList.jsp
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -1
    • +7
    /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
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
3:49 pm

Marcin Cieslak

LDEV-4828 Rewrite Add Collection button

Options
    • -3
    • +3
    /lams_central/web/qb/collection.jsp
    • -18
    • +9
    /lams_central/web/qb/collectionList.jsp
3:33 pm

Marcin Cieslak

LDEV-4828 Strip HTML tags from collection name for jqGrid

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
3:16 pm

Marcin Cieslak

LDEV-4828 Split collection view into list and single collection views

Options
    • -2
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +237
    /lams_central/web/qb/collection.jsp
    • -124
    • +33
    /lams_central/web/qb/collectionList.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -20
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 19 Jun 2019
9:49 pm

Marcin Cieslak

LDEV-3316 Add generics to base DAO so no casting is needed for results

Options
    • -301
    • +301
    /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -602
    • +604
    /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
8:25 pm

Marcin Cieslak

LDEV-4828 Removal and moving questions is available only on stats page

Options
    • -52
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -3
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -168
    • +3
    /lams_central/web/qb/collectionList.jsp
    • -159
    • +225
    /lams_central/web/qb/stats.jsp
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -4
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
7:17 pm

Marcin Cieslak

LDEV-4828 Prepare for splitting collection view

Options
    • -422
    • +0
    /lams_central/web/qb/collection.jsp
    • -0
    • +422
    /lams_central/web/qb/collectionList.jsp
12:46 pm

Ernie Ghiglione

LDEV-4769 Updating translations

Updating Greek

Options
    • -3
    • +96
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
6:34 am

Andrey Balan

Merge branch 'LDEV-4832' into LDEV-4745

Options
6:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -207
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/SearchQBController.java
    • -0
    • +293
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +207
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +49
    /lams_central/web/qb/collection.jsp
    • -1
    • +15
    /lams_central/web/qb/stats.jsp
    • -18
    • +1
    /lams_central/web/questions/importExport.jsp
    • -0
    • +44
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbConstants.java
    • -0
    • +263
    /lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -2
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +352
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbUtils.java
    • -36
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -27
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  16. … 14 more files in changeset.
Tuesday 18 Jun 2019
12:12 am

Andrey Balan

Merge branch 'LDEV-4826' into LDEV-4745

Options
12:11 am

Andrey Balan

LDEV-4826 Add export QTI feature to QB questions page

Options
    • -9
    • +0
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -476
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/ImsQtiController.java
    • -0
    • +496
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +16
    /lams_central/web/qb/stats.jsp
    • -2
    • +2
    /lams_central/web/questions/importExport.jsp
    • -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
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.