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
Monday 30 May 2022
10:39 pm

Marcin Cieslak

LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

Options
    • -0
    • +21
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +558
    /lams_monitoring/web/timelimit/timeLimit.jsp
    • -20
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -20
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -7
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +6
    /lams_tool_assessment/web/WEB-INF/jboss-web.xml
    • -555
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -2
    • +8
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -1
    • +8
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
    • -20
    • +0
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -20
    • +0
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -0
    • +6
    /lams_tool_doku/web/WEB-INF/jboss-web.xml
    • -329
    • +7
    /lams_tool_doku/web/pages/monitoring/summary.jsp
  16. … 15 more files in changeset.
Sunday 29 May 2022
1:17 am

Marcin Cieslak

LDEV-4617 Add missing label for email verification

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
1:17 am

Marcin Cieslak

LDEV-4617 Fix paths to JSP pages for verification email sent/confirmed

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java
12:21 am

Marcin Cieslak

Merge branch 'LDEV-5316' into v4.6

Options
12:21 am

Marcin Cieslak

LDEV-5316 Change content folder ID to default one

Only for questions which have images referring the default content

folder and which do not have images which refer a new content folder.

Options
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220528.sql
Saturday 28 May 2022
1:33 am

Marcin Cieslak

Merge branch 'LDEV-5315' into v4.6

Options
1:30 am

Marcin Cieslak

LDEV-5315 Refresh lesson & sequence tab in monitoring after gate toggle

Options
    • -3
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -0
    • +7
    /lams_monitoring/web/gate/gateStatus.jsp
    • -0
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Friday 27 May 2022
2:47 pm

Marcin Cieslak

LDEV-5273 Fix allocation of answers being prefixed with "null"

Options
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Thursday 26 May 2022
9:28 pm

Marcin Cieslak

LDEV-4366 Fix Kumalive role detection

Options
    • -7
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +1
    /lams_learning/web/kumalive/kumalive.jsp
Wednesday 25 May 2022
9:28 pm

Marcin Cieslak

LDEV-213 Do not hardcode IGPS URL

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Tuesday 17 May 2022
5:00 pm

Marcin Cieslak

LDEV-4792 Fix optional activity and branching min/max spinners

Options
    • -19
    • +27
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
4:34 pm

Marcin Cieslak

LDEV-4020 Use prop() instead of attr() in authoring JS code

Newer jQuery version operate with prop(). Using attr() allowed for

example multiple branches to be marked as the default one.

Options
    • -19
    • +17
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
1:25 pm

Marcin Cieslak

LDEV-5928 Change labels to reflect file submission as 2 step process

Options
    • -10
    • +10
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -10
    • +11
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
Friday 13 May 2022
11:05 pm

Marcin Cieslak

LDEV-5081 Make "regular monitoring" button show old monitoring UI

Options
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
11:05 pm

Marcin Cieslak

LDEV-5081 Reintroduce old monitoring code to compare with new one

Options
    • -553
    • +304
    /lams_monitoring/web/includes/javascript/monitorLesson.js
8:33 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into LDEV-5081

Options
1:31 pm

Marcin Cieslak

LDEV-4949 Fix stripped of non-break whitespace

Options
    • -13
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
Thursday 12 May 2022
1:59 am

Marcin Cieslak

LDEV-5309 Fix removing units from numerical question

delete-orphan setting in QbQuestion units causes problems when importing

QbQuestion from XML. JPA does not recognise the collection parent and

fails on save. Another approach to removing units had to be found.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java
    • -4
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 11 May 2022
12:03 am

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5083' into LDEV-5081

Options
12:03 am

Marcin Cieslak

LDEV-5081 Restyle Free jqGrid according to changes made for monitoring

Options
    • -7
    • +14
    /lams_central/web/css/free.ui.jqgrid.custom.css
12:02 am

Marcin Cieslak

LDEV-5083 Reintroduce Popper needed for date time picker

Options
    • -0
    • +6
    /lams_central/web/includes/javascript/popper.min.js
Tuesday 10 May 2022
11:46 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5083' into LDEV-5081

Options
11:45 pm

Marcin Cieslak

LDEV-5081 Merge changes made for monitor in LDEV-5083

Options
    • -23
    • +29
    /lams_build/3rdParty.userlibraries
    • -7
    • +66
    /lams_build/build.xml
    • -3
    • +19
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -178
    • +129
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -7
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -9
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -0
    • +29
    /lams_central/web/css/free.ui.jqgrid.custom.css
    • -177
    • +276
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -163
    • +288
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -30
    • +51
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
    • -1847
    • +1410
    /lams_common/db/sql/create_lams_11_tables.sql
    • -5
    • +3
    /lams_common/db/sql/insert_lams_config_data.sql
    • -4
    • +4
    /lams_common/db/sql/insert_types_data.sql
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql
    • -15
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  16. … 22 more files in changeset.
11:44 pm

Marcin Cieslak

LDEV-5083 Reintroduce changes for Live Edit

Options
    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
4:55 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

Options
    • -1
    • +2
    /3rdParty_sources/versions.txt
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +0
    /lams_build/build.xml
    • -3
    • +2
    /lams_build/liblist.txt
    • -0
    • +1
    /lams_central/web/WEB-INF/web.xml
    • -1
    • +4
    /lams_central/web/authoring/svgGenerator.jsp
    • -10
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -5
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 09 May 2022
12:22 pm

Ernie Ghiglione

LDEV-4769 Updating English, Chinese Simplified

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +14
    /lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
    • -0
    • +24
    /lams_tool_doku/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_notebook/conf/language/lams/ApplicationResources_zh_CN.properties
    • -3
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_survey/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_wiki/conf/language/lams/ApplicationResources_zh_CN.properties
Friday 06 May 2022
8:35 pm

Marcin Cieslak

Merge branch 'LDEV-5314' into v4.6

Options
8:35 pm

Marcin Cieslak

LDEV-5314 Skip exclamation mark if some learners are grouped

Ticket LDEV-3225 introduced a rule that all learners need to be grouped

for a grouping activity to be considered complete. We need to relax this

approach as it produces unnecessary confusion. Now if there are at least

2 groups with learners in them the grouping is considered complete.

Options
    • -28
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -2
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
8:05 pm

Marcin Cieslak

Merge branch 'LDEV-5298' into LDEV-5314

Options
    • -0
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
8:05 pm

Marcin Cieslak

LDEV-5298 Make label for Upload Complete more clear

Options
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties