lams-github / lams_central / web

includes

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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 Mar 2020
1:35 pm

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
    • -1
    • +4
    ./javascript/authoring/authoringActivity.js
    • -3
    • +7
    ./javascript/authoring/authoringGeneral.js
    • -3
    • +14
    ./javascript/authoring/authoringProperty.js
  4. … 19 more files in changeset.
Monday 16 Mar 2020
10:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -1
    • +4
    ./javascript/authoring/authoringActivity.js
    • -3
    • +7
    ./javascript/authoring/authoringGeneral.js
    • -3
    • +14
    ./javascript/authoring/authoringProperty.js
  4. … 34 more files in changeset.
Monday 09 Mar 2020
1:21 pm

Marcin Cieslak

LDEV-4987 Fix file download notification

The bug was introduced in LDEV-4932

Options
    • -1
    • +1
    ./javascript/download.js
Thursday 20 Feb 2020
8:13 am

Andrey Balan

LDEV-4975 Remove now redundant jquery.sizzle.js

Options
    • -7
    • +0
    ./javascript/jquery.sizzle.js
2:15 am

Andrey Balan

LDEV-4975 Remove now redundant jquery.mobile.js

Options
    • -2
    • +0
    ./javascript/jquery.mobile.js
Wednesday 19 Feb 2020
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -5
    • +5
    ./javascript/addLesson.js
    • -2
    • +2
    ./javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./javascript/authoring/authoringGeneral.js
    • -3
    • +3
    ./javascript/authoring/authoringMenu.js
    • -1
    • +1
    ./javascript/dialog.js
    • -6
    • +2
    ./javascript/jquery.js
    • -4
    • +4
    ./javascript/main.js
    • -5
    • +5
    ./javascript/orgGroup.js
    • -2
    • +2
    ./javascript/progressBar.js
    • -1
    • +1
    ./javascript/thickbox.js
  11. … 7 more files in changeset.
Wednesday 12 Feb 2020
8:07 pm

Marcin Cieslak

LDEV-4966, LDEV-4137 Reposition notifications dialog after showing

Options
    • -18
    • +36
    ./javascript/dialog.js
2:14 pm

Marcin Cieslak

LDEV-4966, LDEV-4137 Reposition notifications dialog after showing

Options
    • -26
    • +31
    ./javascript/dialog.js
Thursday 06 Feb 2020
4:33 pm

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -1
    • +1
    ./javascript/portrait.js
  2. … 4 more files in changeset.
1:53 am

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -1
    • +1
    ./javascript/portrait.js
  2. … 1 more file in changeset.
Thursday 16 Jan 2020
6:17 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -28
    • +41
    ./javascript/authoring/authoringGeneral.js
Thursday 09 Jan 2020
3:59 pm

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
    • -27
    • +44
    ./javascript/authoring/authoringGeneral.js
    • -2
    • +7
    ./javascript/authoring/authoringMenu.js
    • -7
    • +7
    ./javascript/main.js
    • -20
    • +31
    ./javascript/orgGroup.js
    • -2
    • +3
    ./javascript/outcome.js
  6. … 90 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -2
    • +8
    ./javascript/download.js
  2. … 9 more files in changeset.
Wednesday 08 Jan 2020
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -2
    • +7
    ./javascript/authoring/authoringMenu.js
  2. … 12 more files in changeset.
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -20
    • +31
    ./javascript/orgGroup.js
    • -5
    • +22
    ./javascript/orgGrouping.js
  3. … 49 more files in changeset.
Monday 06 Jan 2020
6:44 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to Author

- Save, Delete, Copy, Move and rename LDs

- Create folder

Options
    • -27
    • +44
    ./javascript/authoring/authoringGeneral.js
  2. … 3 more files in changeset.
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
    • -13
    • +28
    ./javascript/addLesson.js
    • -0
    • +58
    ./javascript/authoring/authoringGeneral.js
    • -1
    • +1
    ./javascript/authoring/authoringMenu.js
  4. … 17 more files in changeset.
Wednesday 01 Jan 2020
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
    • -7
    • +7
    ./javascript/main.js
  2. … 23 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
    ./javascript/outcome.js
  2. … 3 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
    ./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
    ./javascript/monitorToolSummaryAdvanced.js
  2. … 63 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
    ./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
    ./javascript/jquery.jqGrid.confidence-level-formattter.js
Wednesday 04 Dec 2019
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
    ./javascript/main.js
  2. … 35 more files in changeset.
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -0
    • +19
    ./javascript/main.js
  2. … 13 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
    ./javascript/addLesson.js
  2. … 1 more file in changeset.
Monday 25 Nov 2019
2:45 pm

Marcin Cieslak

LDEV-4771 Re-introduce multiple activity authoring dialogs

Options
    • -7
    • +6
    ./javascript/authoring/authoringActivity.js
  2. … 1 more file in changeset.
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -6
    • +43
    ./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
    ./javascript/main.js
  2. … 4 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
    • -40
    • +0
    ./javascript/authoring/authoringActivity.js
    • -3241
    • +3299
    ./javascript/authoring/authoringGeneral.js
    • -1957
    • +1938
    ./javascript/authoring/authoringProperty.js
  4. … 5 more files in changeset.