lams-github / lams_central

conf

Clone Tools

Stats

Commits this week: 0
Total Committers: 22
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 18 May 2020
8:01 am

Marcin Cieslak

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

Options
    • -2
    • +162
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./language/lams/ApplicationResources_no_NO.properties
  3. … 1 more file in changeset.
7:56 am

Ernie Ghiglione

LDEV-4745 adding labels for Greek and Norwegian

Options
    • -2
    • +162
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./language/lams/ApplicationResources_no_NO.properties
Thursday 14 May 2020
1:27 pm

Marcin Cieslak

LDEV-5024 Import question from QB to TBL template wizard

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 2 more files in changeset.
11:24 am

Marcin Cieslak

LDEV-5024 Add "question from bank" button to TBL template wizard

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Wednesday 06 May 2020
1:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

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

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -0
    • +2
    ./security/Owasp.CsrfGuard.properties
  2. … 30 more files in changeset.
Saturday 02 May 2020
3:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

Options
    • -1
    • +1
    ./scss/_lams_variables.scss
  2. … 16 more files in changeset.
Monday 20 Apr 2020
12:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  2. … 4 more files in changeset.
Friday 03 Apr 2020
3:42 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

Options
    • -2
    • +2
    ./scss/_lams_variables.scss
    • -1
    • +1
    ./scss/_lams_variables_purple.scss
  3. … 18 more files in changeset.
Tuesday 31 Mar 2020
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  2. … 15 more files in changeset.
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/questions/questionFile.jsp

Options
    • -0
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  2. … 15 more files in changeset.
Friday 27 Mar 2020
3:43 am

Andrey Balan

LDEV-4995 Further development of index page

Options
    • -1
    • +1
    ./scss/_lams_variables.scss
  2. … 16 more files in changeset.
Saturday 21 Mar 2020
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -2
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
    • -6
    • +3
    ./scss/_lams_variables.scss
    • -6
    • +4
    ./scss/_lams_variables_purple.scss
  4. … 196 more files in changeset.
Friday 20 Mar 2020
6:35 am

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -0
    • +2
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  3. … 20 more files in changeset.
Monday 16 Mar 2020
3:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +2
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  3. … 35 more files in changeset.
Friday 21 Feb 2020
5:41 pm

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -1
    • +6
    ./security/Owasp.CsrfGuard.properties
  2. … 6 more files in changeset.
Tuesday 18 Feb 2020
3:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -6
    • +0
    ./security/Owasp.CsrfGuard.properties
  2. … 192 more files in changeset.
Wednesday 12 Feb 2020
2:21 pm

Andrey Balan

LDEV-4932 Add CSRF to password change

Options
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  2. … 1 more file in changeset.
2:21 pm

Andrey Balan

LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

Options
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  2. … 1 more file in changeset.
Friday 07 Feb 2020
10:18 pm

Andrey Balan

Merge branch 'master' into v4.0

Options
    • -1
    • +0
    ./security/Owasp.CsrfGuard.properties
10:17 pm

Andrey Balan

LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

Options
    • -1
    • +0
    ./security/Owasp.CsrfGuard.properties
  2. … 3 more files in changeset.
Thursday 23 Jan 2020
7:42 pm

Andrey Balan

Merge branch 'master' into v4.0

Options
    • -0
    • +5
    ./security/Owasp.CsrfGuard.properties
7:26 pm

Andrey Balan

LDEV-4932 Add CSRF to LKC monitoring

Options
    • -0
    • +5
    ./security/Owasp.CsrfGuard.properties
Thursday 16 Jan 2020
11:04 pm

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

Options
    • -0
    • +2
    ./security/Owasp.CsrfGuard.properties
  2. … 3 more files in changeset.
Friday 10 Jan 2020
3:28 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

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

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

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

Options
    • -1
    • +2
    ./security/Owasp.CsrfGuard.properties
  2. … 14 more files in changeset.
Thursday 09 Jan 2020
11:10 pm

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -0
    • +18
    ./security/Owasp.CsrfGuard.properties
  2. … 32 more files in changeset.
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

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

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

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

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# 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/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -0
    • +237
    ./security/Owasp.CsrfGuard.properties
  2. … 94 more files in changeset.
7:58 am

Marcin Cieslak

LDEV-4932 Adjust CSRF Guard logging

Logger uses LAMS format and logs only warnings (attacks) rather than all

its checks.

Options
    • -1
    • +2
    ./security/Owasp.CsrfGuard.properties
  2. … 3 more files in changeset.
Wednesday 08 Jan 2020
10:44 pm

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -1
    • +4
    ./security/Owasp.CsrfGuard.properties
  2. … 9 more files in changeset.
Tuesday 07 Jan 2020
11:34 pm

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -0
    • +4
    ./security/Owasp.CsrfGuard.properties
  2. … 12 more files in changeset.
8:42 pm

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -0
    • +14
    ./security/Owasp.CsrfGuard.properties
  2. … 50 more files in changeset.