lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 01 Feb 2021
5:44 am

Ernie Ghiglione

LDEV-5143 and LDEV-5140 labels updates

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 20 more files in changeset.
Thursday 07 Jan 2021
9:16 am

Ernie Ghiglione

LDEV-4769 Update Greek

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 3 more files 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
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 29 more files in changeset.
Thursday 10 Dec 2020
1:33 pm

Marcin Cieslak

LDEV-4075 Re-introduce skipping branching in Preview

Options
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -10
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -7
    • +15
    ./web/branching/preview.jsp
    • -1
    • +1
    ./web/optionsActivity.jsp
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.
Monday 16 Nov 2020
12:25 pm

Marcin Cieslak

LDEV-4915, LDEV-3971 Silence an unnecessary exception log

If this exception occurs, the user can probably and should carry on

instead of trying to create a session which already exists.

Options
    • -4
    • +18
    ./src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java
Friday 06 Nov 2020
4:52 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 11 more files in changeset.
Thursday 05 Nov 2020
10:54 am

Marcin Cieslak

LDEV-5102 Prevent Scratchie from giving marks to absent learner

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 5 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.
Monday 19 Oct 2020
10:24 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 2 more files in changeset.
Wednesday 14 Oct 2020
6:58 am

Marcin Cieslak

LDEV-5093 Populate lesson Notebook entry correctly while editing

Options
    • -2
    • +2
    ./web/notebook/view.jsp
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.
Sunday 04 Oct 2020
4:29 am

Ernie Ghiglione

LDEV-4769 Updating labels Green, Norwegian, English

Options
    • -6
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 8 more files in changeset.
Monday 28 Sep 2020
8:35 pm

Marcin Cieslak

LDEV-4718 Fix plugin race condition by manually disabling buttons

Options
    • -3
    • +5
    ./web/grouping/choose.jsp
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 20 Sep 2020
4:20 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 1 more file 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
    • -111
    • +70
    ./conf/language/lams/ApplicationResources_de_DE.properties
  2. … 40 more files in changeset.
Friday 21 Aug 2020
3:40 am

Ernie Ghiglione

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

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 14 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
    • -8
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 25 more files in changeset.
Monday 17 Aug 2020
6:05 am

Ernie Ghiglione

LDEV-4769 Updating English , Spanish, Norwegian

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 5 more files in changeset.
Friday 07 Aug 2020
6:52 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -19
    • +19
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -6
    • +0
    ./web/parallelActivity.jsp
  8. … 39 more files in changeset.
Sunday 02 Aug 2020
4:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -102
    • +0
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  3. … 20 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
    • -207
    • +189
    ./conf/language/lams/ApplicationResources.properties
    • -196
    • +189
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -198
    • +189
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -198
    • +189
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -131
    • +189
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -196
    • +189
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 166 more files in changeset.