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
Monday 11 Jan 2021
12:14 pm

Marcin Cieslak

LDEV-5140 Add real release/hide marks buttons

Options
    • -158
    • +101
    ./web/gradebookMonitor.jsp
    • -7
    • +58
    ./web/releaseLessonMarks.jsp
Friday 08 Jan 2021
7:27 am

Marcin Cieslak

LDEV-5140 Introduce Release Marks panel for sending emails to learners

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +89
    ./src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -21
    • +49
    ./web/gradebookMonitor.jsp
    • -0
    • +109
    ./web/releaseLessonMarks.jsp
  5. … 1 more file in changeset.
7:27 am

Marcin Cieslak

LDEV-5140 Introduce Release Marks panel for sending emails to learners

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +89
    ./src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -21
    • +49
    ./web/gradebookMonitor.jsp
    • -0
    • +109
    ./web/releaseLessonMarks.jsp
  5. … 1 more file in changeset.
Wednesday 30 Dec 2020
10:05 am

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

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

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 29 more files in changeset.
Monday 07 Dec 2020
12:07 pm

Marcin Cieslak

LDEV-5120 Allow hiding criteria titles in Rating.tag

Options
    • -3
    • +9
    ./web/WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.
Thursday 03 Dec 2020
11:21 am

Marcin Cieslak

LDEV-5127 Adjust reported pad height when toolbar is not displayed

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

Marcin Cieslak

LDEV-5127 Fix pad resizing

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

Marcin Cieslak

LDEV-5113 Introduce manual grading tool output

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 4 more files in changeset.
Wednesday 21 Oct 2020
2:54 pm

Marcin Cieslak

LDEV-5091 Etherpad.tag to accept predefined pad ID

Options
    • -29
    • +45
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Friday 09 Oct 2020
4:25 pm

Marcin Cieslak

LDEV-5091 Initialise Etherpads on Discussion panel expand

Options
    • -6
    • +17
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 36 more files in changeset.
Tuesday 06 Oct 2020
9:33 pm

Marcin Cieslak

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

Options
    • -4
    • +3
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
9:25 pm

Marcin Cieslak

LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

Options
    • -4
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Monday 05 Oct 2020
12:16 pm

Marcin Cieslak

LDEV-4425 Do not escape user names. Add padding to portrait.

Options
    • -4
    • +4
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
6:27 am

Marcin Cieslak

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

Options
    • -21
    • +25
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
6:19 am

Marcin Cieslak

LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

Options
    • -22
    • +28
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Tuesday 22 Sep 2020
7:40 am

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -3
    • +4
    ./web/WEB-INF/tags/Arrow.tag
  2. … 52 more files in changeset.
Sunday 13 Sep 2020
6:12 am

Ernie Ghiglione

Updating translations English, Greek, German and Norwegian

Added German to Lokalise. All labels are the same but the output file format is slightly different.

Options
    • -91
    • +67
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  3. … 39 more files in changeset.
Friday 21 Aug 2020
3:40 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 11 more files in changeset.
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

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

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -22
    • +58
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 25 more files in changeset.
7:49 am

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
8:12 am

Marcin Cieslak

LDEV-5064 Fix weighted mark calculation in selected lesson gradebook

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

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
7:27 am

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
9:32 am

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
6:52 am

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
4: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
1: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.
9:04 am

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
11:45 am

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
10:48 am

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.