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 27 Mar 2019
7:57 pm

Marcin Cieslak

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

Options
    • -12
    • +12
    /lams_central/web/authoring/authoring.jsp
    • -45
    • +45
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -7
    • +9
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
7:56 pm

Marcin Cieslak

Merge branch 'LDEV-4792'

Options
7:55 pm

Marcin Cieslak

LDEV-4792 Rewrite authoring spinners from jQuery UI to plain HTML 5

Options
    • -12
    • +12
    /lams_central/web/authoring/authoring.jsp
    • -45
    • +45
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
7:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    /lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
  16. … 73 more files in changeset.
6:29 pm

Marcin Cieslak

LDEV-3450 Fix learner criteria import

Options
    • -15
    • +16
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
2:56 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -4
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -6
    • +12
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
2:52 am

Andrey Balan

LDEV-4797 Remove isGateActivityCompletionBased flag in case schedule gate doesn't have preceding activity

Options
    • -4
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -6
    • +12
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
1:21 am

Andrey Balan

LDEV-4797 Remove isGateActivityCompletionBased flag in case schedule gate doesn't have preceding activity

Options
    • -4
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -4
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ScheduleGateActivityStrategy.java
12:57 am

Andrey Balan

LDEV-4795 Fix gates' title messages

Also some code formatting.

Options
    • -11
    • +5
    /lams_learning/web/gate/conditionGateContent.jsp
    • -13
    • +6
    /lams_learning/web/gate/permissionGateContent.jsp
    • -14
    • +8
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -11
    • +6
    /lams_learning/web/gate/synchGateContent.jsp
Tuesday 26 Mar 2019
6:27 pm

Andrey Balan

Merge branch 'master' into develop

Options
4:09 am

Andrey Balan

LDEV-4796 Fix refresh button issue after clicking "Expand all" one

Options
    • -2
    • +2
    /lams_monitoring/web/tblmonitor/sequence.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
3:52 am

Andrey Balan

LDEV-4794 TBLmonitor display question numbering only if setting is ON

Options
    • -1
    • +6
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
3:31 am

Andrey Balan

LDEV-4793 Fixing TBLmonitor's issues with iPad

Options
    • -9
    • +2
    /lams_monitoring/web/css/_tblmonitor_base.scss
    • -1
    • +7
    /lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
Monday 25 Mar 2019
8:07 am

Ernie Ghiglione

LDEV-4739 Updating translations

Options
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
Saturday 23 Mar 2019
3:15 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +12
    /lams_central/web/WEB-INF/web.xml
3:14 am

Andrey Balan

LDEV-4791 Fix link to delete course grouping controller

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/orgGrouping.js
3:07 am

Andrey Balan

LDEV-4790 Fix showing of username on the profile editing page

Options
    • -8
    • +14
    /lams_central/web/profile/editprofile.jsp
Thursday 21 Mar 2019
9:58 pm

Marcin Cieslak

LDEV-4786 Removing mapping does not remove outcome

Also limit outcome editing to sysadmin only.

Options
    • -1
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -17
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -2
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
Tuesday 19 Mar 2019
6:04 pm

Marcin Cieslak

LDEV-4782 Display burning questions in stats

Options
    • -0
    • +28
    /lams_central/web/qb/stats.jsp
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -1
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbStatsDTO.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:34 pm

Marcin Cieslak

Merge branch 'LDEV-4731'

Options
1:57 am

Andrey Balan

Merge branch 'LDEV-4765' into LDEV-4777

Options
    • -73
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
Friday 15 Mar 2019
10:32 pm

Andrey Balan

Merge branch 'LDEV-4789' into develop

Options
10:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

Options
    • -8
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
10:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

Options
    • -8
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
Thursday 14 Mar 2019
5:45 pm

Marcin Cieslak

LDEV-4782 Display no data as "-" rather than 0% in QB stats

Also display lesson and activity IDs as tooltips for debugging.

Options
    • -3
    • +10
    /lams_central/web/qb/stats.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 13 Mar 2019
9:26 pm

Marcin Cieslak

Merge branch 'LDEV-4788' into develop

Options
9:20 pm

Marcin Cieslak

LDEV-4788 All learning outcomes are now global

Options
    • -6
    • +0
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -226
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -9
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeForm.java
    • -9
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeScaleForm.java
    • -0
    • +1
    /lams_central/web/WEB-INF/web.xml
    • -4
    • +3
    /lams_central/web/includes/javascript/main.js
    • -9
    • +8
    /lams_central/web/includes/javascript/outcome.js
    • -3
    • +1
    /lams_central/web/main.jsp
    • -39
    • +10
    /lams_central/web/outcome/outcomeEdit.jsp
    • -48
    • +21
    /lams_central/web/outcome/outcomeManage.jsp
    • -21
    • +7
    /lams_central/web/outcome/scaleEdit.jsp
    • -32
    • +16
    /lams_central/web/outcome/scaleManage.jsp
  16. … 7 more files in changeset.
7:39 pm

Marcin Cieslak

Merge branch 'LDEV-4787' into develop

Options
7:38 pm

Marcin Cieslak

LDEV-4787 Fix incorrect spacing when copying activities in authoring

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
7:22 pm

Marcin Cieslak

Merge branch 'LDEV-4786' into develop

Options