lams-github / lams_central

web

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
Tuesday 22 Sep 2020
9:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -27
    • +44
    ./includes/javascript/authoring/authoringActivity.js
  2. … 7 more files in changeset.
1:40 pm

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -3
    • +4
    ./WEB-INF/tags/Arrow.tag
    • -2
    • +2
    ./authoring/template/tool/assessoption.jsp
    • -2
    • +2
    ./authoring/template/tool/mcoption.jsp
  4. … 50 more files in changeset.
Sunday 13 Sep 2020
11:42 pm

Marcin Cieslak

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

Options
    • -2
    • +6
    ./authoring/template/comms.jsp
    • -24
    • +29
    ./authoring/template/tbl/tbl.jsp
11:41 pm

Marcin Cieslak

LDEV-5074 Prevent double submit of TBL template

Options
    • -2
    • +6
    ./authoring/template/comms.jsp
    • -24
    • +29
    ./authoring/template/tbl/tbl.jsp
Tuesday 08 Sep 2020
12:11 am

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-5071 Fix race condition when opening activity authoring

Options
    • -2
    • +14
    ./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
    ./includes/javascript/authoring/authoringActivity.js
6:38 pm

Marcin Cieslak

LDEV-5071 Fix race condition when generating tool content ID

Options
    • -28
    • +33
    ./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
    ./css/_authoring_base.scss
    • -14
    • +4
    ./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
    ./css/_authoring_base.scss
    • -14
    • +4
    ./includes/javascript/authoring/authoringActivity.js
8:37 pm

Marcin Cieslak

LDEV-5016 Reintroduce and improve branch transitions labels

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

Marcin Cieslak

LDEV-5200 Reintroduce and improve branch transitions labels

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

Marcin Cieslak

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

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

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-5200 Improve snapping activities to grid

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

Marcin Cieslak

LDEV-5016 Improve snapping activities to grid

Options
    • -14
    • +14
    ./includes/javascript/authoring/authoringActivity.js
    • -5
    • +11
    ./includes/javascript/authoring/authoringGeneral.js
    • -7
    • +3
    ./includes/javascript/authoring/authoringHandler.js
Tuesday 01 Sep 2020
12:18 am

Marcin Cieslak

LDEV-5016 Always rotate transition arrow correctly

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

Marcin Cieslak

LDEV-5200 Always rotate transition arrow correctly

Options
    • -29
    • +16
    ./includes/javascript/authoring/authoringActivity.js
Monday 31 Aug 2020
9:02 pm

Marcin Cieslak

LDEV-5200 Adjust transition start dot position

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

Marcin Cieslak

LDEV-5016 Adjust transition start dot position

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

Marcin Cieslak

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

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

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-5200 Move authoring colours from JavaScript to CSS

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

Marcin Cieslak

LDEV-5016 Move authoring colours from JavaScript to CSS

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

Marcin Cieslak

LDEV-5016 Adjust activity size. Add banner.

Options
    • -10
    • +30
    ./includes/javascript/authoring/authoringActivity.js
    • -2
    • +7
    ./includes/javascript/authoring/authoringGeneral.js
9:05 pm

Marcin Cieslak

LDEV-5200 Adjust activity size. Add banner.

Options
    • -10
    • +30
    ./includes/javascript/authoring/authoringActivity.js
    • -2
    • +7
    ./includes/javascript/authoring/authoringGeneral.js
7:34 pm

Marcin Cieslak

LDEV-5016 Draw arrows on transitions in authoring

Options
    • -29
    • +70
    ./includes/javascript/authoring/authoringActivity.js
    • -0
    • +2
    ./includes/javascript/authoring/authoringGeneral.js
7:34 pm

Marcin Cieslak

LDEV-5200 Draw arrows on transitions in authoring

Options
    • -29
    • +70
    ./includes/javascript/authoring/authoringActivity.js
    • -0
    • +2
    ./includes/javascript/authoring/authoringGeneral.js
6:31 pm

Marcin Cieslak

LDEV-5200 Fix transition drawing on drag and grouping effect adjustment

Options
    • -7
    • +6
    ./includes/javascript/authoring/authoringActivity.js
    • -1
    • +6
    ./includes/javascript/authoring/authoringHandler.js
6:31 pm

Marcin Cieslak

LDEV-5016 Fix transition drawing on drag and grouping effect adjustment

Options
    • -7
    • +6
    ./includes/javascript/authoring/authoringActivity.js
    • -1
    • +6
    ./includes/javascript/authoring/authoringHandler.js