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
Sunday 13 Sep 2020
12:12 pm

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
9: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
2:46 pm

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
12:05 pm

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
12:52 pm

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
10: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
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
    • -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.
3:04 pm

Marcin Cieslak

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

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.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
    • -8
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 5 more files in changeset.
Friday 05 Jun 2020
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./web/gate/gateDescription.jsp
  2. … 19 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.
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -109
    • +109
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
    • -148
    • +148
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -128
    • +128
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -111
    • +111
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
    • -111
    • +111
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -75
    • +75
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -635
    • +635
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -1072
    • +1072
    ./web/includes/javascript/kumalive.js
  9. … 413 more files in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -62
    • +74
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 30 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
    • -109
    • +109
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
    • -148
    • +148
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -128
    • +128
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -111
    • +111
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
    • -111
    • +111
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -75
    • +75
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -635
    • +635
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -1072
    • +1072
    ./web/includes/javascript/kumalive.js
  10. … 455 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/grouping/choose.jsp
    • -1
    • +1
    ./web/grouping/show.jsp
    • -3
    • +3
    ./web/kumalive/kumalive.jsp
    • -1
    • +1
    ./web/kumalive/kumaliveReport.jsp
    • -5
    • +5
    ./web/kumalive/kumaliveRubrics.jsp
    • -1
    • +1
    ./web/lessonComplete.jsp
    • -1
    • +1
    ./web/presenceChat.jsp
  8. … 192 more files in changeset.
Friday 20 Mar 2020
1:35 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -62
    • +74
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -14
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
  5. … 18 more files in changeset.
Thursday 19 Mar 2020
5:48 pm

Ernie Ghiglione

LDEV-4989 fixing layout and labels

Options
    • -3
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./web/gate/gateNext.jsp
    • -14
    • +10
    ./web/gate/passwordGateContent.jsp
Wednesday 18 Mar 2020
9:44 pm

Marcin Cieslak

LDEV-4989 Inform user of incorrect gate password

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java
    • -0
    • +9
    ./web/gate/passwordGateContent.jsp
Monday 16 Mar 2020
10:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -62
    • +74
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -14
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java
    • -1
    • +10
    ./web/gate/gateNext.jsp
    • -0
    • +67
    ./web/gate/passwordGateContent.jsp
  8. … 30 more files in changeset.