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 16 May 2018
7:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

Options
    • -0
    • +9
    /lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +8
    /lams_tool_assessment/web/includes/css/assessment.scss
    • -1
    • +35
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -3
    • +6
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
3:23 am

Andrey Balan

Merge branch 'LDEV-4583'

Options
    • binary
    /lams_build/lib/lams/lams.jar
3:23 am

Andrey Balan

LDEV-4583 Block access to index.do for integration learners

If user comes from integrations and possess only learner rights we

should not allow him/her to access index.do page.

Options
    • -0
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Tuesday 15 May 2018
8:41 pm

Andrey Balan

LDEV-4569 add support for LKC TBL monitoring case

There is a special case, used for LKC TBL monitoring only, when

learning design doesn't contain Scratchie activities. In this case

all Assessments should be shown as AEs.

Options
    • -3
    • +16
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
1:10 am

Andrey Balan

LDEV-4569 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -0
    • +4
    /lams_monitoring/web/css/_tblmonitor_base.scss
    • -1
    • +10
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
Monday 14 May 2018
9:28 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4577: minor UI improvement

Adding a heading to feedback options in advanced tab authoring

Options
    • -1
    • +1
    /lams_tool_lamc/web/authoring/AdvancedContent.jsp
8:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4577 Can now just show feedback without showing answers.

Options
    • -1
    • +9
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -4
    • +10
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -3
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -0
    • +9
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
    • -3
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +12
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -1
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -5
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  16. … 4 more files in changeset.
Friday 11 May 2018
3:09 pm

Marcin Cieslak

Merge branch 'LDEV-4580'

Options
3:09 pm

Marcin Cieslak

LDEV-4580, LDEV-4497 Fix content dir path when exporting/importing LD

Options
    • -3
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:36 pm

Marcin Cieslak

Merge branch 'LDEV-4581'

Options
2:35 pm

Marcin Cieslak

LDEV-4581 QTI export now parses images with names with whitespace

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
10:40 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: fixing label

Options
    • -2
    • +2
    /lams_monitoring/web/monitor.jsp
10:33 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4454 Adding labels for kumalive polls in i18n

Options
    • -35
    • +32
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -4
    • +31
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
Thursday 10 May 2018
4:42 pm

Andrey Balan

LDEV-4569 Change burning questions' heading collapse icon

Options
    • -2
    • +2
    /lams_monitoring/web/css/_tblmonitor_base.scss
4:00 pm

Marcin Cieslak

Merge branch 'LDEV-4579'

Options
4:00 pm

Marcin Cieslak

LDEV-4579 Rewrite for.. of.. JS syntax to keep IE 11 compatibility

Options
    • -12
    • +12
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating missing labels and Greek

Options
    • -2
    • +6
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +8
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +16
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +13
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    /lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties
12:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4547 Tweaking background for authoring/chart

Options
    • -0
    • +7
    /lams_central/conf/scss/_lams_variables.scss
    • -0
    • +9
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -9
    • +2
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +4
    /lams_central/web/css/_chart_base.scss
10:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4578: minor fixes

Increse the rows to 8 and title: false when we don't need it.

Options
    • -3
    • +3
    /lams_tool_scratchie/web/pages/learning/results.jsp
1:47 am

Marcin Cieslak

Merge branch 'LDEV-4576'

Options
1:47 am

Marcin Cieslak

LDEV-4576 Check TBL groupings before finishing Live Edit

If groupings are not correct, stay in Live Edit

Options
    • -16
    • +19
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
1:46 am

Marcin Cieslak

LDEV-4576 Ignore edit lock parameter when saving a LD

It is set by special functions in AuthoringService

Options
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
12:13 am

Andrey Balan

Merge branch 'LDEV-4578'

Options
12:09 am

Andrey Balan

LDEV-4578 Display editable status for burning questions

Currently, it's hard to know that you can edit a burning question of

your own authoring. Therefore we should add some sort of indication that

you can click on the text and edit it.

Also, remove the link for General burning questions.

Options
    • -1
    • +23
    /lams_tool_scratchie/web/pages/learning/results.jsp
Wednesday 09 May 2018
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -2
    • +4
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
2:07 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4559'

Options
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    /lams_admin/web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    /lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java
    • -5
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +6
    /lams_central/web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    /lams_central/web/WEB-INF/tags/CommentsAuthor.tag
    • -0
    • +23
    /lams_central/web/comments/anonymouscheckbox.jsp
    • -7
    • +26
    /lams_central/web/comments/edit.jsp
    • -8
    • +37
    /lams_central/web/comments/msgview.jsp
    • -9
    • +18
    /lams_central/web/comments/new.jsp
    • -8
    • +27
    /lams_central/web/comments/reply.jsp
    • -0
    • +5
    /lams_central/web/css/_learner_base.scss
    • -0
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml
  16. … 78 more files in changeset.
Tuesday 08 May 2018
7:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Students can post anonymously in Forum

Options
    • -0
    • +6
    /lams_central/web/css/_learner_base.scss
    • -2
    • +4
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -0
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -0
    • +6
    /lams_tool_forum/web/jsps/authoring/advance.jsp
    • -4
    • +31
    /lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
    • -10
    • +35
    /lams_tool_forum/web/jsps/learning/message/msgview.jsp
    • -5
    • +34
    /lams_tool_forum/web/jsps/learning/message/topiclist.jsp
    • -1
    • +19
    /lams_tool_forum/web/jsps/monitoring/parts/advanceOptions.jsp
8:00 am

Marcin Cieslak

Merge branch 'LDEV-4574'

Options
7:58 am

Marcin Cieslak

LDEV-4574 Re-launch monitoring after Live Edit closes

Options
    • -1
    • +5
    /lams_central/web/includes/javascript/dialog.js
    • -1
    • +5
    /lams_central/web/includes/javascript/main.js
    • -1
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js