lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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 21 Aug 2020
3:43 pm

Marcin Cieslak

LDEV-5061 Upgrade snap.svg to 0.5.1 version

Options
    • -6
    • +6
    ./web/includes/javascript/snap.svg.js
3:31 pm

Marcin Cieslak

Revert "LDEV-5015 Temporarily revert to MCQ as IRA for TBL template"

This reverts commit 59f6851d952d42a5d7b0125959ad3d5f843e7273.

Options
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
3:40 am

Ernie Ghiglione

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +14
    ./conf/language/lams/ApplicationResources_el_GR.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
  6. … 10 more files in changeset.
Thursday 20 Aug 2020
10:28 am

Ernie Ghiglione

LDEV-5024 fixing label

Options
    • -1
    • +1
    ./web/qb/search.jsp
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
    • -1066
    • +1076
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +21
    ./conf/security/Owasp.CsrfGuard.properties
    • -35
    • +111
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -28
    • +30
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -1
    • +4
    ./web/qb/collection.jsp
    • -36
    • +110
    ./web/questions/questionFile.jsp
  8. … 19 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
    • -14
    • +15
    ./web/includes/javascript/authoring/authoringGeneral.js
  2. … 3 more files in changeset.
Wednesday 19 Aug 2020
10:26 am

Marcin Cieslak

LDEV-4917 Add error pop up on attempt of uploading incorrect file

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -18
    • +33
    ./web/qb/importQuestionsXml.jsp
    • -3
    • +19
    ./web/questions/questionFile.jsp
    • -19
    • +36
    ./web/toolcontent/import.jsp
  5. … 7 more files in changeset.
7:45 am

Marcin Cieslak

LDEV-5063 Do not allow empty weights in Learning Design authoring

If a weight is empty, it is filled with 0. If all weights are 0, the

Learning Design is considered non-weighted.

Options
    • -14
    • +15
    ./web/includes/javascript/authoring/authoringGeneral.js
Tuesday 18 Aug 2020
10:30 am

Marcin Cieslak

LDEV-4917 Minor adjustments to existing Uppy uploads

Options
    • -1
    • +1
    ./web/toolcontent/import.jsp
  2. … 2 more files in changeset.
Monday 17 Aug 2020
4:48 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to XML question import

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -9
    • +21
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -39
    • +83
    ./web/qb/importQuestionsXml.jsp
4:34 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -17
    • +31
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -1
    • +1
    ./web/authoring/template/comms.jsp
    • -1
    • +1
    ./web/qb/collection.jsp
    • -45
    • +105
    ./web/questions/questionFile.jsp
  5. … 3 more files in changeset.
10:03 am

Marcin Cieslak

LDEV-4917 Remove unnecessary label in LD import in authoring

Options
    • -5
    • +0
    ./web/toolcontent/import.jsp
10:02 am

Marcin Cieslak

LDEV-4917 Allow only .zip files for LD import in authoring

Options
    • -17
    • +4
    ./web/toolcontent/import.jsp
6:05 am

Ernie Ghiglione

LDEV-4769 Updating English , Spanish, Norwegian

Options
    • -1
    • +14
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 5 more files in changeset.
Monday 10 Aug 2020
3:37 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
Friday 07 Aug 2020
6:13 pm

Marcin Cieslak

LDEV-4917 Add Uppy upload to Learning Desing zip import in authoring

Options
    • -10
    • +21
    ./src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringMenu.js
    • -30
    • +100
    ./web/toolcontent/import.jsp
  4. … 1 more file in changeset.
6:52 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -2
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +10
    ./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
  7. … 40 more files in changeset.
Thursday 06 Aug 2020
5:18 pm

Marcin Cieslak

LDEV-5059 Add Norwegian i18n for jqGrid

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

Marcin Cieslak

LDEV-5059 Add central i18n for jqGrid

Options
    • -0
    • +182
    ./web/includes/javascript/jqgrid-i18n/grid.locale-el.js
    • -0
    • +186
    ./web/includes/javascript/jqgrid-i18n/grid.locale-es.js
    • -0
    • +182
    ./web/includes/javascript/jqgrid-i18n/grid.locale-fr.js
    • -0
    • +25
    ./web/jqGrid.i18n.jsp
    • -0
    • +3
    ./web/qb/collection.jsp
    • -0
    • +2
    ./web/qb/collectionList.jsp
    • -0
    • +3
    ./web/qb/search.jsp
  8. … 4 more files in changeset.
4:00 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -14
    • +14
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +14
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 6 more files in changeset.
Wednesday 05 Aug 2020
4:59 pm

Marcin Cieslak

LDEV-5059 Add missing labels for Question Bank

Options
    • -0
    • +13
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./web/qb/authoring/addmultiplechoice.jsp
    • -4
    • +15
    ./web/qb/collectionList.jsp
    • -6
    • +5
    ./web/qb/stats.jsp
Tuesday 04 Aug 2020
10:39 am

Marcin Cieslak

LDEV-4917 Fix CKEditor upload successful message

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
10:30 am

Marcin Cieslak

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

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
  2. … 3 more files in changeset.
8:20 am

Ernie Ghiglione

Updating labels Spanish, English, French, Norwegian

Options
    • -23
    • +23
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 41 more files in changeset.
7:57 am

Marcin Cieslak

LDEV-4917 Add i18n to Uppy instance

Options
    • -2
    • +0
    ./web/includes/javascript/uppy.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/el_GR.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/es_ES.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/fr_FR.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/uppy.min.js
  6. … 3 more files in changeset.
3:40 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -0
    • +53
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 3 more files in changeset.
Sunday 02 Aug 2020
11:11 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
8:23 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 20 more files in changeset.
2:22 pm

Marcin Cieslak

LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

Options
    • -21
    • +132
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -0
    • +8
    ./web/WEB-INF/web.xml
    • -0
    • +11
    ./web/css/uppy.min.css
    • -0
    • +2
    ./web/includes/javascript/uppy.min.js
  5. … 15 more files in changeset.
4:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -38
    • +38
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 21 more files in changeset.