lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Friday 07 Aug 2020
12:52 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -2
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +10
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -7
    • +7
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
    • -11
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -11
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -14
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -11
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources_fr_FR.properties
    • -11
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
  16. … 31 more files in changeset.
12:44 pm

Marcin Cieslak

Merge branch 'v4.0' into LDEV-4917

Options
10:37 am

Ernie Ghiglione

LDEV-5060 Update lamslesson Moodle module

Update lamslesson Moodle module to work with latest Moodle 3.9

Modification suggested by Francisco Hernan Aravena Oñate <fraaravena@utalca.cl> from University of Talca Chile. based on https://github.com/fharavena/lams/commit/85581938223416ce7d5704126b3e1cbd3a59f427

Adding Spanish translation and update version number

Options
    • -0
    • +60
    /moodle/mod/lamslesson/classes/event/course_module_viewed.php
    • -0
    • +123
    /moodle/mod/lamslesson/lang/es/lamslesson.php
    • -1
    • +25
    /moodle/mod/lamslesson/lib.php
    • -2
    • +2
    /moodle/mod/lamslesson/version.php
    • -3
    • +33
    /moodle/mod/lamslesson/view.php
Thursday 06 Aug 2020
11:18 pm

Marcin Cieslak

LDEV-5059 Add Norwegian i18n for jqGrid

Options
    • -0
    • +99
    /lams_central/web/includes/javascript/jqgrid-i18n/grid.locale-no.js
    • -0
    • +4
    /lams_central/web/jqGrid.i18n.jsp
10:53 pm

Marcin Cieslak

LDEV-5059 Add central i18n for jqGrid

Options
    • -0
    • +182
    /lams_central/web/includes/javascript/jqgrid-i18n/grid.locale-el.js
    • -0
    • +186
    /lams_central/web/includes/javascript/jqgrid-i18n/grid.locale-es.js
    • -0
    • +182
    /lams_central/web/includes/javascript/jqgrid-i18n/grid.locale-fr.js
    • -0
    • +25
    /lams_central/web/jqGrid.i18n.jsp
    • -0
    • +3
    /lams_central/web/qb/collection.jsp
    • -0
    • +2
    /lams_central/web/qb/collectionList.jsp
    • -0
    • +3
    /lams_central/web/qb/search.jsp
    • -11
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    /lams_gradebook/web/WEB-INF/jboss-web.xml
    • -2
    • +2
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -49
    • +3
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
10:00 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -14
    • +14
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +14
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +10
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
Wednesday 05 Aug 2020
10:59 pm

Marcin Cieslak

Merge branch 'LDEV-5059' into v4.0

Options
10:59 pm

Marcin Cieslak

LDEV-5059 Add missing labels for Question Bank

Options
    • -0
    • +13
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -4
    • +15
    /lams_central/web/qb/collectionList.jsp
    • -6
    • +5
    /lams_central/web/qb/stats.jsp
8:59 pm

Ernie Ghiglione

LDEV-5035 Adding missing labels

Options
    • -0
    • +8
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +8
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +8
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
12:28 am

Marcin Cieslak

LDEV-4917 Add Uppy upload to Share Resources tool

Options
    • -7
    • +4
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -11
    • +9
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -57
    • +87
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -34
    • +63
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
    • -7
    • +5
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
    • -0
    • +75
    /lams_tool_larsrc/web/includes/javascript/rsrccommon.js
    • -28
    • +19
    /lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
    • -1
    • +29
    /lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp
    • -28
    • +19
    /lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
    • -22
    • +20
    /lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
    • -2
    • +6
    /lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp
    • -40
    • +21
    /lams_tool_larsrc/web/pages/learning/addfile.jsp
    • -1
    • +16
    /lams_tool_larsrc/web/pages/learning/learning.jsp
Tuesday 04 Aug 2020
4:39 pm

Marcin Cieslak

LDEV-4917 Fix CKEditor upload successful message

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
4:30 pm

Marcin Cieslak

LDEV-4917 Clean up tmp uploaded files when they are no longer needed

Options
    • -4
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -0
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
    • -0
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
4:20 pm

Marcin Cieslak

LDEV-4917 Add Uppy uploads to Image Gallery learning and monitoring

Options
    • -1
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -19
    • +21
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_images/web/includes/javascript/imageGalleryitem.js
    • -3
    • +0
    /lams_tool_images/web/pages/authoring/authoring.jsp
    • -1
    • +1
    /lams_tool_images/web/pages/authoring/parts/imagefile.jsp
    • -3
    • +20
    /lams_tool_images/web/pages/learning/learning.jsp
    • -3
    • +20
    /lams_tool_images/web/pages/monitoring/monitoring.jsp
2:20 pm

Ernie Ghiglione

Updating labels Spanish, English, French, Norwegian

Options
    • -23
    • +23
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -16
    • +27
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +0
    /lams_tool_chat/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties
    • -7
    • +6
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_tool_chat/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_tool_chat/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_tool_daco/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 27 more files in changeset.
1:57 pm

Marcin Cieslak

LDEV-4917 Add i18n to Uppy instance

Options
    • -2
    • +0
    /lams_central/web/includes/javascript/uppy.min.js
    • -0
    • +2
    /lams_central/web/includes/javascript/uppy/el_GR.min.js
    • -0
    • +2
    /lams_central/web/includes/javascript/uppy/es_ES.min.js
    • -0
    • +2
    /lams_central/web/includes/javascript/uppy/fr_FR.min.js
    • -0
    • +2
    /lams_central/web/includes/javascript/uppy/uppy.min.js
    • -3
    • +11
    /lams_tool_images/web/includes/javascript/imageGalleryitem.js
    • -2
    • +15
    /lams_tool_images/web/pages/authoring/authoring.jsp
    • -1
    • +1
    /lams_tool_images/web/pages/authoring/parts/imagefile.jsp
10:32 am

Ernie Ghiglione

LDEV-4510 Adding tblintro.html en Español

Options
    • -0
    • +17
    /lams_www/web/public/ld-templates/tbl/tblintro_es_ES.html
9:40 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -0
    • +53
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties
Monday 03 Aug 2020
5:11 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
2:23 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -1
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -9
    • +9
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -39
    • +43
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -6
    • +1
    /lams_monitoring/web/parallelProgress.jsp
    • -6
    • +8
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_daco/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
  16. … 8 more files in changeset.
Sunday 02 Aug 2020
8:22 pm

Marcin Cieslak

LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

Options
    • -21
    • +132
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -0
    • +8
    /lams_central/web/WEB-INF/web.xml
    • -0
    • +11
    /lams_central/web/css/uppy.min.css
    • -0
    • +2
    /lams_central/web/includes/javascript/uppy.min.js
    • -1
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -13
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java
    • -11
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
    • -2
    • +1
    /lams_tool_images/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
    • -9
    • +8
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -106
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java
    • -128
    • +76
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
    • -74
    • +11
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
    • -0
    • +9
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java
    • -104
    • +70
    /lams_tool_images/web/includes/javascript/imageGalleryitem.js
  16. … 4 more files in changeset.
10:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -38
    • +38
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -102
    • +0
    /lams_learning/conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -47
    • +0
    /lams_tool_forum/conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -9
    • +14
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
  16. … 7 more files in changeset.
Saturday 01 Aug 2020
6:43 pm

Ernie Ghiglione

LDEV-4769 Fixing incorrect import for Wiki

Sorry my bad.

Options
    • -103
    • +137
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -103
    • +137
    /lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties
    • -103
    • +137
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -104
    • +138
    /lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties
    • -101
    • +126
    /lams_tool_wiki/conf/language/lams/ApplicationResources_fr_FR.properties
    • -105
    • +139
    /lams_tool_wiki/conf/language/lams/ApplicationResources_no_NO.properties
Thursday 30 Jul 2020
12:36 pm

Marcin Cieslak

Merge branch 'LDEV-5058' into v4.0

Options
12:35 pm

Marcin Cieslak

LDEV-5058 Move activity category from DB to authoring front end

Options
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -30
    • +20
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +0
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +0
    /lams_central/web/authoring/svgGenerator.jsp
    • -0
    • +47
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -8
    • +16
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200730.sql
    • -38
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -9
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -12
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
    • -2
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
Wednesday 29 Jul 2020
11:22 am

Ernie Ghiglione

LDEV-4769 Updating labels

Adding missing labels in Spanish, English

Adding translations for Zoom (Norwegian, Spanish)

Options
    • -16
    • +16
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +5
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +22
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +14
    /lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +69
    /lams_tool_zoom/conf/language/lams/ApplicationResources_no_NO.properties
Tuesday 28 Jul 2020
7:48 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish to proper UTF-8 encoding

Options
    • -20
    • +20
    /lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
7:47 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish for Zoom tool

Options
    • -74
    • +67
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +69
    /lams_tool_zoom/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +55
    /lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
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
    • -682
    • +659
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -667
    • +659
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -666
    • +659
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -668
    • +657
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -500
    • +419
    /lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties
    • -668
    • +659
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -1089
    • +1062
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1066
    • +1063
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1066
    • +1063
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -835
    • +1005
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -313
    • +320
    /lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1070
    • +1063
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -328
    • +316
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -327
    • +316
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -327
    • +316
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
  16. … 157 more files in changeset.
3:09 pm

Marcin Cieslak

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

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -2
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
3:06 pm

Marcin Cieslak

Merge branch 'LDEV-5057'

Options