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 22 Nov 2019
4:15 pm

Marcin Cieslak

LDEV-4535 Use vanilla LAMS label for naming groups in TBL template

Options
    • -8
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
4:09 pm

Marcin Cieslak

Merge branch 'LDEV-4912'

Options
4:08 pm

Marcin Cieslak

LDEV-4912 Add session time information to Logged In Users in sysadmin

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +13
    /lams_admin/web/sessionmaintain.jsp
    • -3
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
3:32 pm

Marcin Cieslak

LDEV-4746 Make generated question titles longer

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
4:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -20
    • +32
    /lams_central/web/includes/javascript/main.js
    • -1
    • +1
    /lams_central/web/questions/questionChoice.jsp
    • -1
    • +1
    /lams_central/web/questions/questionFile.jsp
    • -2
    • +2
    /lams_tool_lamc/web/authoring/itemlist.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
Thursday 21 Nov 2019
9:39 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
9:36 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -3
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -0
    • +4
    /lams_central/web/authoring/authoring.jsp
    • -40
    • +0
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -3241
    • +3299
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1957
    • +1938
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
9:25 pm

Marcin Cieslak

Merge branch 'SP-3'

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java
    • -0
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
    • -1
    • +5
    /lams_admin/web/integration/servermaintain.jsp
    • -4
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
9:15 pm

Marcin Cieslak

Merge branch 'LDEV-4909'

Options
9:14 pm

Marcin Cieslak

LDEV-4909 Validate groupings and input on LD save

Options
    • -1
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_central/web/authoring/authoring.jsp
    • -40
    • +0
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -3239
    • +3297
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
8:32 pm

Marcin Cieslak

LDEV-4909 Allow any grouping in any activity

Validation will be done before LD save

Options
    • -1929
    • +1910
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
8:19 pm

Marcin Cieslak

LDEV-4844 Add a missing label

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
7:58 pm

Marcin Cieslak

LDEV-4848 Remove an unnecessary label

Options
    • -1
    • +1
    /lams_central/web/qb/stats.jsp
7:44 pm

Marcin Cieslak

LDEV-4746 Make img tag stripping configurable in DB function

Options
    • -3
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190721.sql
    • -11
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
1:40 am

Marcin Cieslak

Merge branch 'LDEV-4844' into LDEV-4745

Options
1:40 am

Marcin Cieslak

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Options
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +1
    /lams_central/web/qb/stats.jsp
1:35 am

Marcin Cieslak

LDEV-4844 Add an event in audit log when QB questions get merged

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190808.sql
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
1:32 am

Marcin Cieslak

LDEV-4844 Fix answer merging for Assessment questions

Options
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
1:31 am

Marcin Cieslak

LDEV-4844 Allow manual QB question merging

Options
    • -0
    • +37
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -4
    • +68
    /lams_central/web/qb/stats.jsp
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 20 Nov 2019
9:49 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

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

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
9:17 pm

Marcin Cieslak

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

Options
    • -2
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
9:16 pm

Marcin Cieslak

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

Options
8:50 pm

Marcin Cieslak

LDEV-4746 Make options ordered when getting them from DB

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
8:10 pm

Marcin Cieslak

LDEV-4746 Do not string img tags during migration

Options
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190721.sql
6:52 pm

Marcin Cieslak

LDEV-4535 Create group names even if i18n label was not found

Missing label makes groups unusable in LD.

Options
    • -37
    • +51
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
5:46 pm

Marcin Cieslak

Merge branch 'LDEV-4910'

Options
5:45 pm

Marcin Cieslak

LDEV-4910 Fetch question from DB so we can lazy load its options

Options
    • -2
    • +6
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
Tuesday 19 Nov 2019
9:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -14
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -41
    • +72
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -56
    • +25
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -45
    • +79
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -24
    • +23
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -20
    • +41
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -12
    • +20
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -4
    • +4
    /lams_tool_lamc/web/learning/AnswersContent.jsp
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
  16. … 7 more files in changeset.
9:15 pm

Marcin Cieslak

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

Options
8:50 pm

Marcin Cieslak

LDEV-4884 Fix attributes received from TBL template

Options
    • -3
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java