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
Thursday 20 Aug 2020
4:28 pm

Ernie Ghiglione

LDEV-5024 fixing label

Options
    • -1
    • +1
    /lams_central/web/qb/search.jsp
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
    • -3
    • +2
    /lams_build/build.xml
    • -1066
    • +1076
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +21
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -35
    • +111
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -28
    • +30
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -1
    • +4
    /lams_central/web/qb/collection.jsp
    • -36
    • +110
    /lams_central/web/questions/questionFile.jsp
    • -1
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
    • -10
    • +53
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200219_updateTo40.sql
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -22
    • +58
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -8
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -16
    • +14
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  16. … 11 more files in changeset.
1:49 pm

Marcin Cieslak

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

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

Options
    • -14
    • +15
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -12
    • +48
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
1:48 pm

Marcin Cieslak

Merge branch 'LDEV-4917' into v4.0

Options
8:22 am

Ernie Ghiglione

LDEV-4917 remove incorrect spacing

Options
    • -1
    • +1
    /lams_tool_task/web/pages/authoring/conditions.jsp
Wednesday 19 Aug 2020
4:26 pm

Marcin Cieslak

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

Options
    • -18
    • +33
    /lams_admin/web/import/importGroups.jsp
    • -18
    • +33
    /lams_admin/web/import/importexcel.jsp
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -18
    • +33
    /lams_central/web/qb/importQuestionsXml.jsp
    • -3
    • +19
    /lams_central/web/questions/questionFile.jsp
    • -19
    • +36
    /lams_central/web/toolcontent/import.jsp
    • -9
    • +13
    /lams_tool_forum/web/includes/javascript/message.js
    • -1
    • +11
    /lams_tool_images/web/includes/javascript/imageGalleryitem.js
    • -0
    • +1
    /lams_tool_images/web/pages/learning/learning.jsp
    • -0
    • +1
    /lams_tool_images/web/pages/monitoring/monitoring.jsp
    • -8
    • +12
    /lams_tool_task/web/pages/learning/learning.jsp
3:45 pm

Marcin Cieslak

LDEV-4917 Fix Uppy initialisation in Forum learning New Topic

Options
    • -1
    • +2
    /lams_tool_forum/web/jsps/learning/create.jsp
    • -2
    • +0
    /lams_tool_forum/web/jsps/learning/message/topicform.jsp
2:13 pm

Marcin Cieslak

Merge branch 'LDEV-5064'

Options
2:12 pm

Marcin Cieslak

LDEV-5064 Fix weighted mark calculation in selected lesson gradebook

Options
    • -8
    • +17
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
1:50 pm

Marcin Cieslak

LDEV-4813 Revert to an actually correct query for getting lessons

Options
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
1:45 pm

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
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
1:27 pm

Marcin Cieslak

LDEV-5063 Add info about activity weight in lesson gradebook export

Options
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -3
    • +18
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -14
    • +41
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Tuesday 18 Aug 2020
5:56 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to Sysadmin groups and users import

Options
    • -40
    • +8
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -10
    • +11
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -11
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelController.java
    • -7
    • +16
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java
    • -3
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java
    • -11
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportExcelForm.java
    • -7
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportGroupsForm.java
    • -26
    • +83
    /lams_admin/web/import/importGroups.jsp
    • -29
    • +84
    /lams_admin/web/import/importexcel.jsp
4:44 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to Submit Files tool

Options
    • -4
    • +5
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
    • -4
    • +19
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -19
    • +40
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
    • -7
    • +5
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/LearnerForm.java
    • -25
    • +140
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
4:30 pm

Marcin Cieslak

LDEV-4917 Minor adjustments to existing Uppy uploads

Options
    • -1
    • +1
    /lams_central/web/toolcontent/import.jsp
    • -1
    • +1
    /lams_tool_forum/web/jsps/authoring/authoring.jsp
    • -1
    • +1
    /lams_tool_images/web/includes/javascript/imageGalleryitem.js
Monday 17 Aug 2020
10:48 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to XML question import

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

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -17
    • +31
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -1
    • +1
    /lams_central/web/authoring/template/comms.jsp
    • -1
    • +1
    /lams_central/web/qb/collection.jsp
    • -45
    • +105
    /lams_central/web/questions/questionFile.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -1
    • +1
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
4:18 pm

Marcin Cieslak

LDEV-4917 In Task List make file upload smaller, without preview

Options
    • -13
    • +12
    /lams_tool_task/web/pages/learning/learning.jsp
4:15 pm

Marcin Cieslak

LDEV-4917 In Forum make file upload smaller, without preview

Options
    • -13
    • +12
    /lams_tool_forum/web/includes/javascript/message.js
4:14 pm

Marcin Cieslak

LDEV-4917 In Forum fix uploading files if first form submit failed

Options
    • -0
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java
4:03 pm

Marcin Cieslak

LDEV-4917 Remove unnecessary label in LD import in authoring

Options
    • -5
    • +0
    /lams_central/web/toolcontent/import.jsp
4:02 pm

Marcin Cieslak

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

Options
    • -17
    • +4
    /lams_central/web/toolcontent/import.jsp
3:51 pm

Marcin Cieslak

LDEV-4917 Fix upload is Share Resources

Options
    • -1
    • +1
    /lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp
3:40 pm

Marcin Cieslak

Merge branch 'v4.0' into LDEV-4917

Options
12:05 pm

Ernie Ghiglione

LDEV-4769 Updating English , Spanish, Norwegian

Options
    • -0
    • +4
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +14
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_no_NO.properties
Friday 14 Aug 2020
11:32 pm

Marcin Cieslak

Merge branch 'LDEV-5062'

Options
11:32 pm

Marcin Cieslak

LDEV-5062 Do not allow multiple disclose answers requests

Options
    • -2
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
3:32 pm

Marcin Cieslak

LDEV-4813 Fix an invalid query for getting lessons for gradebook

Options
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
Wednesday 12 Aug 2020
7:52 pm

Marcin Cieslak

LDEV-4746 Assign migrated QB questions to their owners' collections

Options
    • -14
    • +38
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -4
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
3:12 am

Ernie Ghiglione

LDEV-5061 remove duplicate shuffle items option 4a9a06a

Options
    • -7
    • +0
    /lams_tool_scratchie/web/pages/authoring/advance.jsp