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 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.
Thursday 20 Feb 2020
12:23 pm

Ernie Ghiglione

LDEV-4878 Sanitise XSS for notes title in learner

Options
    • -9
    • +13
    ./web/notebook/viewall.jsp
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 192 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./web/403.jsp
    • -1
    • +0
    ./web/404.jsp
    • -0
    • +6
    ./web/WEB-INF/web.xml
    • -2
    • +0
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/error.jsp
    • -1
    • +0
    ./web/login.jsp
    • -2
    • +0
    ./web/presenceChat.jsp
    • -2
    • +0
    ./web/requestURL.jsp
  9. … 165 more files in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Tuesday 07 Jan 2020
5:42 pm

Marcin Cieslak

LDEV-4366 Renormalize incorrect line endings for git to work better

Options
    • -319
    • +319
    ./web/css/kumalive.scss
5:42 pm

Marcin Cieslak

LDEV-4366 Renormalize incorrect line endings for git to work better

Options
    • -319
    • +319
    ./web/css/kumalive.scss
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
Saturday 28 Dec 2019
10:54 pm

Marcin Cieslak

LDEV-4935 Secure lesson chat (presence) websockets

Nickname is taken from session, not from incoming parameters. User gets

checked if he participates in the given lesson.

Simplified code, clean up.

Options
    • -69
    • +104
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/presence/dao/IPresenceChatDAO.java
    • -5
    • +1
    ./web/includes/javascript/presence.js
    • -2
    • +1
    ./web/presenceChat.jsp
Friday 20 Dec 2019
3:42 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

# lams_learning/conf/language/lams/ApplicationResources.properties

# lams_learning/conf/language/lams/ApplicationResources_en_AU.properties

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -1
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 14 more files in changeset.
Thursday 19 Dec 2019
6:22 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -14
    • +15
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 41 more files in changeset.
Wednesday 18 Dec 2019
6:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Added ids to support automated testing

Options
    • -1
    • +1
    ./web/gate/gateDescription.jsp
  2. … 1 more file in changeset.
Thursday 12 Dec 2019
12:26 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 16 more files in changeset.
Monday 09 Dec 2019
9:16 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
7:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 63 more files in changeset.
Wednesday 04 Dec 2019
3:44 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# 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_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 34 more files in changeset.
Monday 02 Dec 2019
9:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +11
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
Monday 18 Nov 2019
10:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

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

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

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

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

Options
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -42
    • +91
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  8. … 8 more files in changeset.
Friday 15 Nov 2019
5:18 pm

Marcin Cieslak

LDEV-4900 Put websocket commands in a separate transaction

Otherwise command websocket server does not see them until main

transaction finishes.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
5:17 pm

Marcin Cieslak

LDEV-4900 Fix websocket server run frequency

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
4:10 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4900

Options
    • -26
    • +44
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
5:30 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -26
    • +44
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java