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
Monday 16 Dec 2019
2:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into LDEV-4886

Options
    • -0
    • +19
    ./includes/javascript/main.js
  2. … 1 more file in changeset.
Wednesday 11 Dec 2019
6:11 am

Andrey Balan

LDEV-4880 Correctly check whether variable is undefined

Options
    • -1
    • +1
    ./includes/javascript/jquery.jqGrid.confidence-level-formattter.js
5:05 am

Andrey Balan

LDEV-4927 Show other users' answers right after user answers

* Some minor tweaks in monitor pages

Options
    • -1
    • +0
    ./css/_jquery.jRating_base.scss
    • -1
    • +0
    ./css/_learner_base.scss
  3. … 6 more files in changeset.
Thursday 05 Dec 2019
7:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 QTI import done within TBL template

Options
    • -1
    • +1
    ./authoring/template/tbl/tbl.jsp
  2. … 3 more files in changeset.
Wednesday 04 Dec 2019
9:44 pm

Marcin Cieslak

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Options
    • -1
    • +1
    ./qb/collection.jsp
    • -0
    • +18
    ./questions/questionChoice.jsp
    • -0
    • +1
    ./questions/questionFile.jsp
  4. … 6 more files in changeset.
3:44 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# 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_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -0
    • +19
    ./includes/javascript/main.js
  2. … 35 more files in changeset.
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -0
    • +6
    ./css/_main_base.scss
    • -3
    • +40
    ./group.jsp
    • -0
    • +19
    ./includes/javascript/main.js
  4. … 11 more files in changeset.
Thursday 28 Nov 2019
7:28 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -12
    • +20
    ./includes/javascript/addLesson.js
  2. … 1 more file in changeset.
Tuesday 26 Nov 2019
1:34 am

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -12
    • +21
    ./qb/search.jsp
  2. … 5 more files in changeset.
Monday 25 Nov 2019
2:45 pm

Marcin Cieslak

LDEV-4771 Re-introduce multiple activity authoring dialogs

Options
    • -1
    • +1
    ./authoringConfirm.jsp
    • -7
    • +6
    ./includes/javascript/authoring/authoringActivity.js
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -6
    • +43
    ./includes/javascript/jquery.jqGrid.confidence-level-formattter.js
  2. … 19 more files in changeset.
Friday 22 Nov 2019
4:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -20
    • +32
    ./includes/javascript/main.js
    • -1
    • +1
    ./questions/questionChoice.jsp
    • -1
    • +1
    ./questions/questionFile.jsp
  4. … 2 more files in changeset.
Thursday 21 Nov 2019
9:36 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

Options
    • -0
    • +4
    ./authoring/authoring.jsp
    • -40
    • +0
    ./includes/javascript/authoring/authoringActivity.js
    • -3241
    • +3299
    ./includes/javascript/authoring/authoringGeneral.js
    • -1957
    • +1938
    ./includes/javascript/authoring/authoringProperty.js
  5. … 4 more files in changeset.
9:14 pm

Marcin Cieslak

LDEV-4909 Validate groupings and input on LD save

Options
    • -0
    • +4
    ./authoring/authoring.jsp
    • -40
    • +0
    ./includes/javascript/authoring/authoringActivity.js
    • -3239
    • +3297
    ./includes/javascript/authoring/authoringGeneral.js
  4. … 1 more file in changeset.
8:32 pm

Marcin Cieslak

LDEV-4909 Allow any grouping in any activity

Validation will be done before LD save

Options
    • -1929
    • +1910
    ./includes/javascript/authoring/authoringProperty.js
7:58 pm

Marcin Cieslak

LDEV-4848 Remove an unnecessary label

Options
    • -1
    • +1
    ./qb/stats.jsp
1:40 am

Marcin Cieslak

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Options
    • -1
    • +1
    ./qb/stats.jsp
  2. … 1 more file in changeset.
1:31 am

Marcin Cieslak

LDEV-4844 Allow manual QB question merging

Options
    • -4
    • +68
    ./qb/stats.jsp
  2. … 5 more files in changeset.
Monday 18 Nov 2019
4:23 pm

Marcin Cieslak

LDEV-4902 Fix Login As feature when SAML is in use.

Does not seem to work well on Chrome.

Options
    • -2
    • +3
    ./login.jsp
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

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

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -339
    • +336
    ./main.jsp
    • -0
    • +4
    ./questions/questionChoice.jsp
  3. … 26 more files in changeset.
4:24 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_central/web/includes/javascript/authoring/authoringActivity.js

Options
    • -1
    • +1
    ./authoring/authoring.jsp
    • -2
    • +8
    ./includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./includes/javascript/authoring/authoringMenu.js
Wednesday 06 Nov 2019
9:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 Adding id, classes to make automated testing faster

Options
    • -1
    • +1
    ./authoring/authoring.jsp
    • -2
    • +2
    ./authoring/template/createresult.jsp
    • -1
    • +1
    ./authoring/template/list.jsp
    • -4
    • +4
    ./authoring/template/tbl/appex.jsp
    • -1
    • +1
    ./authoring/template/tbl/tbl.jsp
    • -1
    • +1
    ./includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./includes/javascript/authoring/authoringMenu.js
  8. … 2 more files in changeset.
Tuesday 05 Nov 2019
6:52 pm

Marcin Cieslak

LDEV-4901 Rewrite session invalidation mechanism

On WildFly 8 session invalidation mechanism had some bugs. Marek

introduced a workaround in LDEV-3413. The mechanism was adjusted in

LDEV-4293, especially in this commit

https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=131ce42e64069f574a2a4a9bc1e5c4be4918e5bb

Newer WildFly versions do not seem to have this bug. A part of

workaround was removed in LDEV-4696, but invalidation mechanism stayed

as if the bugs were still present. The mechanism introduced the problem

with timeouts. Now that the bugs seems to be gone, the invalidation

mechanism was rewritten to a more straightforward version which should

have been used from the start.

It is worth keeping in mind that when one user session is present and

another is being created (another browser, integration call, sysadmin's

LoginAs feature), then user gets authenticated, then old session gets

invalidated and the user gets authenticated AGAIN by WildFly using

cached credentials. Caching is so useful that we can not turn it off. It

means that, though, we need to keep login token generated by

LoginRequestServlet for longer than just first authentication, as we get

authentication call twice. Now we keep it until it is timed out.

Options
    • -2
    • +1
    ./login.jsp
  2. … 3 more files in changeset.
4:53 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -9
    • +10
    ./includes/javascript/main.js
4:51 am

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -9
    • +10
    ./includes/javascript/main.js
Monday 04 Nov 2019
4:10 pm

Marcin Cieslak

LDEV-4893 Current activity opens in a pop up in monitor progress bar

Options
    • -1
    • +3
    ./includes/javascript/progressBar.js
Friday 25 Oct 2019
8:50 pm

Andrey Balan

LDEV-4879 Create lesson in subgroups at one go

Options
    • -41
    • +81
    ./addLesson.jsp
    • -1
    • +8
    ./includes/javascript/addLesson.js
  3. … 3 more files in changeset.
Thursday 24 Oct 2019
8:21 pm

Marcin Cieslak

LDEV-3000 Add a fix for QTI import pop up closing in Chrome

Options
    • -0
    • +4
    ./questions/questionChoice.jsp
7:22 pm

Marcin Cieslak

LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

Options
    • -0
    • +1
    ./authoring/template/tool/assessmcq.jsp
    • -0
    • +2
    ./authoring/template/tool/assessment.jsp
    • -1
    • +1
    ./authoring/template/tool/mcquestion.jsp
  4. … 7 more files in changeset.