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
Tuesday 25 Aug 2020
3:19 pm

Marcin Cieslak

LDEV-5200 Make vertical transition direction a priority over horizontal

Options
    • -4
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
3:19 pm

Marcin Cieslak

LDEV-5016 Make vertical transition direction a priority over horizontal

Options
    • -4
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
3:09 pm

Marcin Cieslak

LDEV-5200 Redraw transitions on drag, not just drop

Options
    • -17
    • +10
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -15
    • +25
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
3:09 pm

Marcin Cieslak

LDEV-5016 Redraw transitions on drag, not just drop

Options
    • -17
    • +10
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -15
    • +25
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
2:02 pm

Marcin Cieslak

LDEV-5016 Use more general approach to calculate a shape box in SVG

Options
    • -6
    • +6
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
2:02 pm

Marcin Cieslak

LDEV-5200 Use more general approach to calculate a shape box in SVG

Options
    • -6
    • +6
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
1:58 pm

Marcin Cieslak

LDEV-5200 Use path replacement rather than removal & creation

Options
    • -13
    • +19
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
1:58 pm

Marcin Cieslak

LDEV-5016 Use path replacement rather than removal & creation

Options
    • -13
    • +19
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
Monday 24 Aug 2020
5:38 pm

Marcin Cieslak

Merge branch 'LDEV-5067' into v4.0

Options
5:38 pm

Marcin Cieslak

LDEV-5067 Do not show disclose group answers if activity is not grouped

Options
    • -9
    • +13
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
5:26 pm

Marcin Cieslak

Merge branch 'LDEV-5066' into v4.0

Options
5:25 pm

Marcin Cieslak

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

Options
    • -0
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -6
    • +8
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
5:19 pm

Marcin Cieslak

LDEV-5066 Do not show uncofigured Etherpad option in Assessment

Options
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -6
    • +12
    /lams_tool_assessment/web/pages/authoring/advance.jsp
5:02 pm

Marcin Cieslak

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

Options
5:01 pm

Marcin Cieslak

Merge branch 'LDEV-5068'

Options
5:01 pm

Marcin Cieslak

LDEV-5068 Fix survey question-per-page validation

Options
    • -4
    • +7
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java
Friday 21 Aug 2020
11:41 pm

Marcin Cieslak

LDEV-5016 Draw bezier curves for transitions in LD authoring

Options
    • -64
    • +119
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +5
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
11:41 pm

Marcin Cieslak

LDEV-5200 Draw bezier curves for transitions in LD authoring

Options
    • -64
    • +119
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +5
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
9:43 pm

Marcin Cieslak

LDEV-5061 Upgrade snap.svg to 0.5.1 version

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

Marcin Cieslak

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

This reverts commit 59f6851d952d42a5d7b0125959ad3d5f843e7273.

Options
    • -6
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
9:31 pm

Marcin Cieslak

Merge branch 'LDEV-5065' into v4.0

Options
9:30 pm

Marcin Cieslak

LDEV-5065 Confirm before disclosing answers in Assessment monitoring

Options
    • -0
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +16
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -19
    • +42
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
9:40 am

Ernie Ghiglione

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

Options
    • -0
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +14
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +2
    /lams_tool_images/conf/language/lams/ApplicationResources.properties
    • -1
    • +12
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
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