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
Saturday 12 Sep 2020
12:56 am

Marcin Cieslak

Merge branch 'LDEV-5073'

Options
12:55 am

Marcin Cieslak

LDEV-5073 Do not autofresh monitoring if a modal dialog is open

Options
    • -2
    • +6
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -4
    • +6
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
Thursday 10 Sep 2020
1:18 pm

Marcin Cieslak

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

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_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_admin/conf/language/lams/ApplicationResources_no_NO.properties

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
1:14 pm

Marcin Cieslak

Merge branch 'LDEV-5072'

Options
Wednesday 09 Sep 2020
4:25 pm

Marcin Cieslak

LDEV-5072 Allow customisation of LTI user ID parameter name

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -12
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
    • -2
    • +2
    /lams_admin/web/integration/ltiConsumer.jsp
    • -31
    • +27
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200909.sql
    • -10
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
    • -44
    • +43
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Tuesday 08 Sep 2020
12:11 am

Marcin Cieslak

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

Options
    • -2
    • +14
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
12:11 am

Marcin Cieslak

LDEV-5071 Fix race condition when opening activity authoring

Options
    • -2
    • +14
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
Monday 07 Sep 2020
6:40 pm

Marcin Cieslak

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

Options
    • -28
    • +33
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
6:38 pm

Marcin Cieslak

Merge branch 'LDEV-5071'

Options
6:38 pm

Marcin Cieslak

LDEV-5071 Fix race condition when generating tool content ID

Options
    • -28
    • +33
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
Friday 04 Sep 2020
9:03 pm

Marcin Cieslak

LDEV-5016 Adjust branching shape and colour

An icon inside a circle is still needed.

Options
    • -5
    • +8
    /lams_central/web/css/_authoring_base.scss
    • -14
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
9:03 pm

Marcin Cieslak

LDEV-5200 Adjust branching shape and colour

An icon inside a circle is still needed.

Options
    • -5
    • +8
    /lams_central/web/css/_authoring_base.scss
    • -14
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
8:37 pm

Marcin Cieslak

LDEV-5016 Reintroduce and improve branch transitions labels

Options
    • -7
    • +12
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -9
    • +0
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
8:37 pm

Marcin Cieslak

LDEV-5200 Reintroduce and improve branch transitions labels

Options
    • -7
    • +12
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -9
    • +0
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
1:08 am

Marcin Cieslak

LDEV-5016 Improve selection of start and end points of transitions

Options
    • -8
    • +18
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
1:08 am

Marcin Cieslak

LDEV-5200 Improve selection of start and end points of transitions

Options
    • -8
    • +18
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
12:19 am

Marcin Cieslak

LDEV-5200 Improve snapping activities to grid

Options
    • -14
    • +14
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -5
    • +11
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -7
    • +3
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
12:19 am

Marcin Cieslak

LDEV-5016 Improve snapping activities to grid

Options
    • -14
    • +14
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -5
    • +11
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -7
    • +3
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
Tuesday 01 Sep 2020
8:29 pm

Marcin Cieslak

LKC-213 Add entry point to lesson container list

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
12:18 am

Marcin Cieslak

LDEV-5016 Always rotate transition arrow correctly

Options
    • -29
    • +16
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
12:18 am

Marcin Cieslak

LDEV-5200 Always rotate transition arrow correctly

Options
    • -29
    • +16
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
Monday 31 Aug 2020
11:40 pm

Marcin Cieslak

Merge branch 'LDEV-5070' into v4.0

Options
11:39 pm

Marcin Cieslak

LDEV-5070 Remove a temporary workaround introduced in LDEV-4841

Options
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
9:02 pm

Marcin Cieslak

LDEV-5200 Adjust transition start dot position

Options
    • -10
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
9:02 pm

Marcin Cieslak

LDEV-5016 Adjust transition start dot position

Options
    • -10
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
8:56 pm

Marcin Cieslak

LDEV-5200 Make transitions to/from branching edges always non-bezier

Options
    • -2
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
8:56 pm

Marcin Cieslak

LDEV-5016 Make transitions to/from branching edges always non-bezier

Options
    • -2
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
8:44 pm

Marcin Cieslak

LDEV-5200 Move authoring colours from JavaScript to CSS

Options
    • -7
    • +81
    /lams_central/web/css/_authoring_base.scss
    • -54
    • +22
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -27
    • +14
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -9
    • +5
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
8:44 pm

Marcin Cieslak

LDEV-5016 Move authoring colours from JavaScript to CSS

Options
    • -7
    • +81
    /lams_central/web/css/_authoring_base.scss
    • -54
    • +22
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -27
    • +14
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -9
    • +5
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
Sunday 30 Aug 2020
9:26 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/authoring/advance.jsp

lams_tool_assessment/web/pages/authoring/authoring.jsp

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/advance.jsp
    • -2
    • +7
    /lams_tool_assessment/web/pages/authoring/authoring.jsp