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
Friday 20 Dec 2019
1:58 pm

Marcin Cieslak

LDEV-4932 Extra comment in web.xml

Options
    • -1
    • +3
    ./WEB-INF/web.xml
1:38 pm

Marcin Cieslak

LDEV-4932 List actions to protect instead of checking everything

Options
    • -1
    • +1
    ./WEB-INF/web.xml
  2. … 1 more file in changeset.
Thursday 19 Dec 2019
4:01 pm

Marcin Cieslak

Revert "LDEV-4932 Initial integration of CSRF Guard"

This reverts commit c5a709e4cb42d0729ad3fbd814714fb27dd844df.

It should have been in a separate branch.

Options
    • -70
    • +0
    ./WEB-INF/tlds/security/csrfguard.tld
    • -33
    • +1
    ./WEB-INF/web.xml
    • -3
    • +1
    ./profile/editprofile.jsp
  4. … 7 more files in changeset.
4:00 pm

Marcin Cieslak

LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

Options
    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
    • -1
    • +33
    ./WEB-INF/web.xml
    • -1
    • +3
    ./profile/editprofile.jsp
  4. … 7 more files in changeset.
4:00 pm

Marcin Cieslak

LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

Options
    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
    • -1
    • +33
    ./WEB-INF/web.xml
    • -1
    • +3
    ./profile/editprofile.jsp
  4. … 7 more files in changeset.
2:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4931 Adding ids to support Admin tests

Options
    • -1
    • +1
    ./main.jsp
    • -1
    • +1
    ./passwordChangeContent.jsp
    • -2
    • +2
    ./passwordChangeOkContent.jsp
    • -2
    • +2
    ./profile/editprofile.jsp
    • -1
    • +1
    ./profile/portrait.jsp
    • -5
    • +5
    ./profile/profile.jsp
  7. … 2 more files in changeset.
Wednesday 18 Dec 2019
11:18 pm

Andrey Balan

LDEV-4930 Avoid displaying excessive user parameters on edit profile jsp

Options
    • -20
    • +6
    ./profile/editprofile.jsp
  2. … 3 more files in changeset.
Monday 16 Dec 2019
7:45 am

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.
Tuesday 10 Dec 2019
11:11 pm

Andrey Balan

LDEV-4880 Correctly check whether variable is undefined

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

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
12: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
2: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.
Tuesday 03 Dec 2019
8:44 pm

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.
7:17 pm

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
12: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.
Monday 25 Nov 2019
6:34 pm

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -12
    • +21
    ./qb/search.jsp
  2. … 5 more files in changeset.
7:45 am

Marcin Cieslak

LDEV-4771 Re-introduce multiple activity authoring dialogs

Options
    • -1
    • +1
    ./authoringConfirm.jsp
    • -7
    • +6
    ./includes/javascript/authoring/authoringActivity.js
Friday 22 Nov 2019
6:51 pm

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.
Thursday 21 Nov 2019
9:12 pm

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.
2: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.
2: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.
1: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
12:58 pm

Marcin Cieslak

LDEV-4848 Remove an unnecessary label

Options
    • -1
    • +1
    ./qb/stats.jsp
Wednesday 20 Nov 2019
6:40 pm

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.
6:31 pm

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
9:23 am

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
2: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
4: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.
9:24 am

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
2: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.