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
Sunday 15 Mar 2020
2:38 am

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

Options
2:36 am

Marcin Cieslak

Merge branch 'LDEV-4991'

Options
2:35 am

Marcin Cieslak

LDEV-4991 Fix URL when setting outcome result in Gradebook

Options
    • -1
    • +1
    /lams_gradebook/web/gradebookMonitor.jsp
2:31 am

Marcin Cieslak

LDEV-4991 Fix SQL conditions when searching for an outcome

Options
    • -7
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
Thursday 12 Mar 2020
1:55 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.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/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -32
    • +28
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -13
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +4
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -0
    • +11
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -2
    • +9
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -2
    • +8
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
    • -1
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
1:34 pm

Marcin Cieslak

Merge branch 'LDEV-4990'

Options
1:33 pm

Marcin Cieslak

LDEV-4990 Style results page the same way as learning page in Scratchie

Options
    • -1
    • +3
    /lams_tool_scratchie/web/pages/learning/results.jsp
1:14 pm

Marcin Cieslak

LDEV-4987 Round percentage cell in tRAT monitoring

Options
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
10:12 am

Ernie Ghiglione

LDEV-4987 Minor adjustments in layout

Options
    • -7
    • +8
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Wednesday 11 Mar 2020
1:47 pm

Marcin Cieslak

Merge branch 'LDEV-4987'

Options
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -1
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -0
    • +4
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -0
    • +11
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -4
    • +6
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
5:56 am

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -38
    • +29
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +6
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -0
    • +4
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Monday 09 Mar 2020
1:21 pm

Marcin Cieslak

Merge branch 'LDEV-4987' into v4.0

Options
1:21 pm

Marcin Cieslak

LDEV-4987 Fix file download notification

The bug was introduced in LDEV-4932

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/download.js
10:10 am

Ernie Ghiglione

LDEV-4986 Updating labels

Options
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
10:10 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -2
    • +18
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
10:04 am

Ernie Ghiglione

LDEV-4739 Updating Greek and Norwegian

Options
    • -2
    • +18
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
10:03 am

Ernie Ghiglione

LDEV-4986 Updating labels

Options
    • -6
    • +22
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -6
    • +22
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
Sunday 08 Mar 2020
8:12 pm

Marcin Cieslak

Merge branch 'LDEV-4986'

Options
8:11 pm

Marcin Cieslak

LDEV-4986 Lowest score (not zero) is default for unravelled question

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
7:37 pm

Marcin Cieslak

LDEV-4559 Better error handling in Zoom tool

Options
    • -1
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -13
    • +33
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -14
    • +26
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
Saturday 07 Mar 2020
11:03 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
Thursday 05 Mar 2020
11:45 am

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
5:04 am

Ernie Ghiglione

LDEV-4984 Adding labels for i18n

Options
    • -3
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
5:03 am

Ernie Ghiglione

LDEV-4984 Adding label for i18n

Options
    • -3
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
12:50 am

Marcin Cieslak

Merge branch 'LDEV-4984'

Options
12:50 am

Marcin Cieslak

LDEV-4984 Add SAPA factor to Spreadsheet export

Options
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -54
    • +107
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java
Wednesday 04 Mar 2020
1:37 am

Marcin Cieslak

Merge branch 'LDEV-4983'

Options
1:24 am

Marcin Cieslak

LDEV-4983 Round Peer Review factors to 2 decimal places instead of 1

Also make Email screen consistent with calculation in Spreadsheet export

Options
    • -73
    • +86
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
Friday 28 Feb 2020
12:41 am

Marcin Cieslak

SP-4 Process different structure of staff enrolment file

Options
    • -163
    • +170
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java