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
Thursday 18 Jun 2020
11:50 pm

Marcin Cieslak

LDEV-5041 Add individual time limits

Options
    • -1
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -2
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java
    • -1
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -0
    • +49
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +5
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -3
    • +59
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -0
    • +104
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
7:29 pm

Marcin Cieslak

LDEV-5041 Add "Finish now" feature

Options
    • -1
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +13
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -9
    • +27
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
7:28 pm

Marcin Cieslak

LDEV-5041 Provide correct user ID when fetching seconds till time limit

Options
    • -2
    • +2
    /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
    • -2
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
6:21 pm

Marcin Cieslak

LDEV-5041 Add absolute time limit feature to Assessment

Options
    • -2
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql
    • -6
    • +23
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -1
    • +1
    /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/web/controller/LearningController.java
    • -5
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -4
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -11
    • +20
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -3
    • +10
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -12
    • +62
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -32
    • +178
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
Wednesday 17 Jun 2020
7:26 pm

Marcin Cieslak

LDEV-5041 Update jQuery Countdown

Options
    • -6
    • +7
    /lams_central/web/includes/javascript/jquery.countdown.js
    • -4
    • +9
    /lams_central/web/includes/javascript/jquery.plugin.js
6:17 pm

Marcin Cieslak

LDEV-5041 Control relative time limit in Assessment monitor

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1
    • +20
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -134
    • +139
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -0
    • +70
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -1
    • +73
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
12:43 pm

Ernie Ghiglione

LDEV-4769 Updating labels

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_www/web/public/ld-templates/tbl/tblintro.html
    • -3
    • +3
    /lams_www/web/public/ld-templates/tbl/tblintro_en_AU.html
12:51 am

Marcin Cieslak

LDEV-5041 Rewrite Assessment time limit with websockets

Options
    • -1
    • +2
    /lams_tool_assessment/.classpath
    • -1
    • +19
    /lams_tool_assessment/build.xml
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -6
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -34
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -12
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -34
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +238
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -43
    • +107
    /lams_tool_assessment/web/pages/learning/learning.jsp
Tuesday 16 Jun 2020
5:25 am

dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump commons-collections in /3rdParty_sources/tacitknowledge/autopatch

Bumps commons-collections from 3.0 to 3.2.2.

Signed-off-by: dependabot[bot] <support@github.com>

Options
    • -1
    • +1
    /3rdParty_sources/tacitknowledge/autopatch/pom.xml
Monday 15 Jun 2020
5:58 pm

Marcin Cieslak

LDEV-5041 Rewrite Assessment time limit to Java 8 time classes

Options
    • -17
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -4
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
3:26 pm

Ernie Ghiglione

LDEV-5042 Open authoring in popup instead

Options
    • -2
    • +7
    /lams_central/web/lti/addLesson.jsp
Friday 12 Jun 2020
10:23 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

Options
    • -0
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -2
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -2
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
10:20 pm

Marcin Cieslak

Merge branch 'LDEV-5038'

Options
10:18 pm

Marcin Cieslak

LDEV-5038 Add group to user name in lesson monitor sequence tab

Options
    • -7
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -12
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -2
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
12:02 pm

Ernie Ghiglione

LDEV-5040: jboss-cli* to remain

We use these for starting WF as a service in unix servers.

Options
    • -2
    • +1
    /lams_build/build.xml
Thursday 11 Jun 2020
8:38 pm

Marcin Cieslak

Merge branch 'LDEV-5039' into v4.0

Options
8:38 pm

Marcin Cieslak

LDEV-5039 Do not hide QB after question add. Make AE questions collapse.

Options
    • -5
    • +13
    /lams_central/web/authoring/template/comms.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -8
    • +2
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -3
    • +7
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -3
    • +7
    /lams_central/web/authoring/template/tool/assessment.jsp
Wednesday 10 Jun 2020
1:13 pm

Marcin Cieslak

Merge branch 'LDEV-5037' into v4.0

Options
1:13 pm

Marcin Cieslak

LDEV-5037 Allow JMX calls to retrieve server internal stats

Options
    • -0
    • +6
    /lams_build/conf/slim/standalone.xml
1:13 pm

Marcin Cieslak

LDEV-5037 Allow JMX calls to retrieve server internal stats

Options
    • -0
    • +6
    /lams_build/conf/slim/standalone.xml
Monday 08 Jun 2020
2:02 am

Marcin Cieslak

Merge branch 'LDEV-5035'

Options
2:01 am

Marcin Cieslak

LDEV-5035 Introduce tolerance in Peer Review SAP and SAPA factors

Options
    • -4
    • +7
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20200607.sql
    • -2
    • +13
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java
    • -14
    • +30
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
    • -1
    • +6
    /lams_tool_preview/web/pages/authoring/advance.jsp
1:57 am

Marcin Cieslak

LDEV-5035 Introduce tolerance in Peer Review SAP and SAPA factors

Options
    • -4
    • +7
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20200607.sql
    • -2
    • +13
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java
    • -14
    • +30
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
    • -1
    • +6
    /lams_tool_preview/web/pages/authoring/advance.jsp
Friday 05 Jun 2020
8:20 pm

Marcin Cieslak

LDEV-5032 Make a checkbox depend on a another checkbox being checked

Options
    • -3
    • +18
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    /lams_admin/web/userlist.jsp
    • -1
    • +1
    /lams_admin/web/usersearchlist.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -20
    • +32
    /lams_central/web/includes/javascript/main.js
    • -3
    • +5
    /lams_central/web/main.jsp
    • -1
    • +1
    /lams_central/web/passwordChangeContent.jsp
    • -2
    • +2
    /lams_central/web/passwordChangeOkContent.jsp
    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -1
    • +1
    /lams_central/web/profile/portrait.jsp
    • -5
    • +5
    /lams_central/web/profile/profile.jsp
    • -1
    • +2
    /lams_central/web/questions/questionChoice.jsp
    • -1
    • +1
    /lams_central/web/questions/questionFile.jsp
    • -1
    • +1
    /lams_learning/web/gate/gateDescription.jsp
    • -1
    • +1
    /lams_monitoring/web/gate/gateInfo.jsp
    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
  16. … 5 more files in changeset.
6:05 pm

Marcin Cieslak

Merge branch 'LDEV-5032' into v4.0

Options
6:05 pm

Marcin Cieslak

LDEV-5032 Add anonymous confidence levels in Scratchie

Options
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql
    • -0
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +7
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp
    • -0
    • +1
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
5:12 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
5:11 pm

Marcin Cieslak

Merge branch 'LDEV-5036'

Options
5:11 pm

Marcin Cieslak

LDEV-5036 Do not prematurely map resource ID to a LAMS lesson

Options
    • -29
    • +33
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java