lams-github

lams_gradebook

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
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 20 Aug 2020
1:49 pm

Marcin Cieslak

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

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +48
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  3. … 2 more files in changeset.
Wednesday 19 Aug 2020
2:12 pm

Marcin Cieslak

LDEV-5064 Fix weighted mark calculation in selected lesson gradebook

Options
    • -8
    • +17
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
1:50 pm

Marcin Cieslak

LDEV-4813 Revert to an actually correct query for getting lessons

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
1:27 pm

Marcin Cieslak

LDEV-5063 Add info about activity weight in lesson gradebook export

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +18
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -14
    • +41
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Friday 14 Aug 2020
3:32 pm

Marcin Cieslak

LDEV-4813 Fix an invalid query for getting lessons for gradebook

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
Friday 07 Aug 2020
12:52 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -11
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -11
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -14
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -11
    • +0
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -11
    • +0
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 41 more files in changeset.
Thursday 06 Aug 2020
10:53 pm

Marcin Cieslak

LDEV-5059 Add central i18n for jqGrid

Options
    • -11
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./web/WEB-INF/jboss-web.xml
    • -2
    • +2
    ./web/gradebookCourseLearner.jsp
    • -49
    • +3
    ./web/includes/jsp/jqGridIncludes.jsp
  5. … 7 more files in changeset.
Tuesday 28 Jul 2020
7:30 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

Options
    • -136
    • +123
    ./conf/language/lams/ApplicationResources.properties
    • -135
    • +123
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -135
    • +123
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -134
    • +123
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -91
    • +87
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -134
    • +123
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 166 more files in changeset.
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
  2. … 33 more files in changeset.
Friday 17 Jul 2020
5:45 pm

Marcin Cieslak

LDEV-5054 Fix Learning Outcome removal Ajax call

Options
    • -0
    • +1
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 31 more files in changeset.
Monday 22 Jun 2020
4:48 pm

Marcin Cieslak

LDEV-5041 Add lesson service utility method

Options
    • -10
    • +10
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 5 more files in changeset.
Monday 01 Jun 2020
3:19 pm

Marcin Cieslak

LDEV-5025 Allow leaving comments even after user rated

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.
Friday 29 May 2020
6:39 pm

Marcin Cieslak

LDEV-4925 Fix new lines on learner results page in Peer Review

Options
    • -1
    • +1
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
Wednesday 27 May 2020
3:12 pm

Marcin Cieslak

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/Rating.tag
  2. … 34 more files in changeset.
12:51 am

Marcin Cieslak

LDEV-5052 Refresh page and scroll to comments on rating

Options
    • -4
    • +13
    ./web/WEB-INF/tags/Rating.tag
  2. … 33 more files in changeset.
Thursday 21 May 2020
2:44 pm

Marcin Cieslak

LDEV-5030 Sanitise user names for initial Etherpad content

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Monday 18 May 2020
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Friday 15 May 2020
6:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Saturday 02 May 2020
9:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

Options
    • -46
    • +47
    ./web/gradebookMonitor.jsp
    • -3
    • +6
    ./web/includes/jsp/jqGridIncludes.jsp
  3. … 15 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -84
    • +84
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -625
    • +625
    ./src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
  4. … 461 more files in changeset.
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
Saturday 21 Mar 2020
9:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -1
    • +1
    ./web/gradebookCourseMonitor.jsp
    • -3
    • +3
    ./web/gradebookMonitor.jsp
    • -1
    • +1
    ./web/includes/jsp/jqGridIncludes.jsp
  4. … 196 more files in changeset.
Sunday 15 Mar 2020
2:35 am

Marcin Cieslak

LDEV-4991 Fix URL when setting outcome result in Gradebook

Options
    • -1
    • +1
    ./web/gradebookMonitor.jsp
Saturday 22 Feb 2020
12:41 am

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 6 more files in changeset.
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 192 more files in changeset.
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 35 more files in changeset.
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

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

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 38 more files in changeset.