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 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# 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/web/includes/javascript/authoring/authoringGeneral.js

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -41
    • +81
    ./addLesson.jsp
    • -1
    • +5
    ./authoring/authoring.jsp
    • -13
    • +28
    ./includes/javascript/addLesson.js
    • -0
    • +58
    ./includes/javascript/authoring/authoringGeneral.js
    • -1
    • +1
    ./includes/javascript/authoring/authoringMenu.js
    • -12
    • +21
    ./qb/search.jsp
    • -5
    • +69
    ./qb/stats.jsp
  8. … 13 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
8:39 pm

Ernie Ghiglione

LDEV-4932: Adding CSRF to forum and central

CSRF additions to:

- Forum authoring methods

- Adding outcomes to activities in tools (changes to tag and central methods)

Options
    • -1
    • +1
    ./outcome/outcomeManage.jsp
  2. … 10 more files in changeset.
11:54 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central

Adding CSRF to:

- Lesson dependencies (add/remove)

- Set dates to finish lesson

Options
    • -9
    • +13
    ./indexLessonConditions.jsp
  2. … 2 more files in changeset.
8:49 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

Options
    • -1
    • +3
    ./emailuser.jsp
  2. … 10 more files in changeset.
Wednesday 01 Jan 2020
7:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -2
    • +2
    ./outcome/outcomeEdit.jsp
    • -3
    • +3
    ./profile/editprofile.jsp
  3. … 40 more files in changeset.
2:35 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

Options
    • -5
    • +2
    ./addLesson.jsp
    • -6
    • +1
    ./admin.jsp
    • -7
    • +1
    ./authoringConfirm.jsp
    • -0
    • +8
    ./common/taglibs.jsp
    • -2
    • +1
    ./dialogCloser.jsp
    • -6
    • +1
    ./editLessonIntro.jsp
    • -5
    • +2
    ./error.jsp
    • -7
    • +2
    ./errorContent.jsp
    • -5
    • +1
    ./favoriteOrganisations.jsp
    • -7
    • +7
    ./includes/javascript/main.js
    • -5
    • +1
    ./index.jsp
    • -6
    • +4
    ./main.jsp
    • -8
    • +2
    ./outcome/outcomeEdit.jsp
    • -8
    • +3
    ./outcome/outcomeManage.jsp
    • -7
    • +2
    ./outcome/scaleEdit.jsp
  16. … 9 more files in changeset.
Tuesday 31 Dec 2019
11:25 am

Ernie Ghiglione

LDEV-4932 Add CSRF to central (outcomes)

Adding CSRF protection to:

- Delete outcomes

Options
    • -2
    • +3
    ./includes/javascript/outcome.js
    • -4
    • +3
    ./outcome/outcomeManage.jsp
  3. … 2 more files in changeset.
Monday 30 Dec 2019
8:30 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to admin

Adding CSRF token:

- When adding/editing learning outcomes

- Adding/editing and removing themes

Options
    • -3
    • +4
    ./outcome/outcomeEdit.jsp
  2. … 4 more files in changeset.
Wednesday 25 Dec 2019
6:28 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

Options
    • -2
    • +7
    ./includes/javascript/common.js
  2. … 2 more files in changeset.
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -16
    • +15
    ./includes/javascript/monitorToolSummaryAdvanced.js
  2. … 63 more files in changeset.
Monday 23 Dec 2019
7:43 pm

Marcin Cieslak

LDEV-4932 Remove obsolete form input

Options
    • -1
    • +0
    ./profile/editprofile.jsp
Friday 20 Dec 2019
10:57 pm

Marcin Cieslak

LDEV-4932 Use same approach to token injection in all forms

Options
    • -1
    • +2
    ./profile/editprofile.jsp
8:58 pm

Marcin Cieslak

LDEV-4932 Extra comment in web.xml

Options
    • -1
    • +3
    ./WEB-INF/web.xml
8: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
11: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.
11: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.
11: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.
9: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.
6:18 am

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
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