lams-github

lams_central

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
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
    • -7
    • +0
    ./build.xml
    • -3
    • +0
    ./conf/security/Owasp.CsrfGuard.properties
    • -70
    • +0
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -33
    • +1
    ./web/WEB-INF/web.xml
    • -3
    • +1
    ./web/profile/editprofile.jsp
  6. … 5 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
    • +7
    ./build.xml
    • -0
    • +3
    ./conf/security/Owasp.CsrfGuard.properties
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -1
    • +33
    ./web/WEB-INF/web.xml
    • -1
    • +3
    ./web/profile/editprofile.jsp
  6. … 5 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
    • +7
    ./build.xml
    • -0
    • +3
    ./conf/security/Owasp.CsrfGuard.properties
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -1
    • +33
    ./web/WEB-INF/web.xml
    • -1
    • +3
    ./web/profile/editprofile.jsp
  6. … 5 more files in changeset.
9:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4931 Adding ids to support Admin tests

Options
    • -1
    • +1
    ./web/main.jsp
    • -1
    • +1
    ./web/passwordChangeContent.jsp
    • -2
    • +2
    ./web/passwordChangeOkContent.jsp
    • -2
    • +2
    ./web/profile/editprofile.jsp
    • -1
    • +1
    ./web/profile/portrait.jsp
    • -5
    • +5
    ./web/profile/profile.jsp
  7. … 2 more files in changeset.
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -10
    • +8
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
  4. … 40 more files in changeset.
6:18 am

Andrey Balan

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

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/web/ProfileController.java
    • -13
    • +1
    ./src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -23
    • +1
    ./src/java/org/lamsfoundation/lams/web/UserForm.java
    • -20
    • +6
    ./web/profile/editprofile.jsp
Monday 16 Dec 2019
8:37 pm

Marcin Cieslak

LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  2. … 1 more file in changeset.
2:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into LDEV-4886

Options
    • -0
    • +19
    ./web/includes/javascript/main.js
  2. … 1 more file in changeset.
Thursday 12 Dec 2019
12:26 am

Andrey Balan

Merge branch 'master' into develop

# 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_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

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

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

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

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

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

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

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

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

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

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

Options
    • -4
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 15 more files in changeset.
Wednesday 11 Dec 2019
6:11 am

Andrey Balan

LDEV-4880 Correctly check whether variable is undefined

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

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 more files in changeset.
5:05 am

Andrey Balan

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

* Some minor tweaks in monitor pages

Options
    • -1
    • +0
    ./web/css/_jquery.jRating_base.scss
    • -1
    • +0
    ./web/css/_learner_base.scss
  3. … 6 more files in changeset.
Monday 09 Dec 2019
7:59 pm

Marcin Cieslak

LDEV-4920 Use correct ID when informing which questions were imported

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
7:37 pm

Ernie Ghiglione

LDEV-4769 updating labels

Greek and English

Options
    • -4
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
7:02 pm

Marcin Cieslak

LDEV-4920 Allow empty value for a request parameter

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
Saturday 07 Dec 2019
6:07 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

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

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 2 more files in changeset.
3:39 am

Andrey Balan

LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

Options
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 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
    ./web/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
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +23
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -1
    • +1
    ./web/qb/collection.jsp
    • -0
    • +18
    ./web/questions/questionChoice.jsp
    • -0
    • +1
    ./web/questions/questionFile.jsp
  7. … 3 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
    ./web/includes/javascript/main.js
  2. … 35 more files in changeset.
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -12
    • +29
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/web/controller/CollapseOrganisationController.java
    • -0
    • +6
    ./web/css/_main_base.scss
    • -3
    • +40
    ./web/group.jsp
    • -0
    • +19
    ./web/includes/javascript/main.js
  6. … 9 more files in changeset.
Saturday 30 Nov 2019
6:49 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_central/conf/language/lams/ApplicationResources_no_NO.properties

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java

Options
    • -25
    • +161
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 3 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
    ./web/includes/javascript/addLesson.js
  2. … 1 more file in changeset.
Tuesday 26 Nov 2019
10:04 am

Ernie Ghiglione

LDEV-4769 Updating labels

Updating Norwegian

Options
    • -26
    • +158
    ./conf/language/lams/ApplicationResources_no_NO.properties
1:34 am

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -12
    • +21
    ./web/qb/search.jsp
  3. … 4 more files in changeset.
Monday 25 Nov 2019
7:02 pm

Andrey Balan

LDEV-4908 When exporting VSAs in QTI, all options should be exported

Options
    • -32
    • +23
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
2:45 pm

Marcin Cieslak

LDEV-4771 Re-introduce multiple activity authoring dialogs

Options
    • -1
    • +1
    ./web/authoringConfirm.jsp
    • -7
    • +6
    ./web/includes/javascript/authoring/authoringActivity.js
Sunday 24 Nov 2019
11:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4907 Password changes corrected in audit

Options
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
  2. … 1 more file in changeset.
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

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

Marcin Cieslak

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

Options
    • -8
    • +3
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  2. … 1 more file in changeset.