lams-github / lams_central / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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 13 Jan 2020
9:20 pm

Marcin Cieslak

LDEV-4884 Skip QB questions with existing UUID on XML import

Options
    • -1
    • +39
    ./org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
Friday 10 Jan 2020
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -7
    • +10
    ./org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -7
    • +8
    ./org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +2
    ./org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -2
    • +3
    ./org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
  6. … 28 more files in changeset.
Thursday 09 Jan 2020
11:12 pm

Marcin Cieslak

SP-4 Staff gets only monitor and author roles, not learner

Options
    • -14
    • +23
    ./org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
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
    • -5
    • +6
    ./org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 94 more files in changeset.
2:34 pm

Marcin Cieslak

SP-4 Add teacher to subcourses

Options
    • -35
    • +72
    ./org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Wednesday 08 Jan 2020
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
  2. … 12 more files in changeset.
3:52 am

Marcin Cieslak

SP-4 Provision staff members

Options
    • -211
    • +340
    ./org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -8
    • +8
    ./org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -1
    • +0
    ./org/lamsfoundation/lams/web/PasswordChangeController.java
    • -3
    • +1
    ./org/lamsfoundation/lams/web/PortraitController.java
    • -6
    • +7
    ./org/lamsfoundation/lams/web/PortraitSaveController.java
    • -2
    • +5
    ./org/lamsfoundation/lams/web/ProfileSaveController.java
  6. … 46 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
    • -6
    • +7
    ./org/lamsfoundation/lams/workspace/web/WorkspaceController.java
  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
    • -3
    • +3
    ./org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -5
    • +10
    ./org/lamsfoundation/lams/web/HomeController.java
  3. … 18 more files in changeset.
Thursday 02 Jan 2020
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
    ./org/lamsfoundation/lams/web/outcome/OutcomeController.java
  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
    • -4
    • +5
    ./org/lamsfoundation/lams/web/LessonConditionsController.java
  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
    • -2
    • +3
    ./org/lamsfoundation/lams/web/EmailUserController.java
  2. … 10 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
    • +2
    ./org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 3 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
    • -2
    • +3
    ./org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 4 more files in changeset.
Thursday 19 Dec 2019
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
    ./org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +0
    ./org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -6
    • +5
    ./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
    ./org/lamsfoundation/lams/web/ProfileController.java
    • -13
    • +1
    ./org/lamsfoundation/lams/web/ProfileSaveController.java
    • -23
    • +1
    ./org/lamsfoundation/lams/web/UserForm.java
  4. … 1 more file in changeset.
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
    ./org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  2. … 1 more file in changeset.
Wednesday 11 Dec 2019
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
    ./org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 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
    ./org/lamsfoundation/lams/web/qb/ImsQtiController.java
7:02 pm

Marcin Cieslak

LDEV-4920 Allow empty value for a request parameter

Options
    • -2
    • +2
    ./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
    ./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
    ./org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 10 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
    • -4
    • +23
    ./org/lamsfoundation/lams/web/QuestionsController.java
    • -3
    • +14
    ./org/lamsfoundation/lams/web/qb/ImsQtiController.java
  3. … 7 more files in changeset.
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -12
    • +29
    ./org/lamsfoundation/lams/web/DisplayGroupController.java
    • -0
    • +51
    ./org/lamsfoundation/lams/web/controller/CollapseOrganisationController.java
  3. … 12 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
    ./org/lamsfoundation/lams/web/qb/ImsQtiController.java
Sunday 24 Nov 2019
11:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4907 Password changes corrected in audit

Options
    • -4
    • +1
    ./org/lamsfoundation/lams/web/PasswordChangeController.java
  2. … 1 more file in changeset.
Friday 22 Nov 2019
5:01 pm

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-4535 Use vanilla LAMS label for naming groups in TBL template

Options
    • -8
    • +3
    ./org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
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
    • -3
    • +6
    ./org/lamsfoundation/lams/web/HomeController.java
  2. … 7 more files in changeset.