lams-github / lams_admin / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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
Tuesday 04 Feb 2020
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

Options
    • -8
    • +13
    ./lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/UserController.java
    • -3
    • +3
    ./lamsfoundation/lams/admin/web/form/UserForm.java
  4. … 36 more files in changeset.
Thursday 09 Jan 2020
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
    • -2
    • +3
    ./lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
  2. … 94 more files in changeset.
Friday 03 Jan 2020
11:44 am

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
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
  2. … 19 more files in changeset.
Tuesday 31 Dec 2019
11:36 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to Admin

Adding it to:

- User roles

- Create course

- Clone lessons

- assign roles in courses

- global roles

- change password for course

- change user pass

- delete all lessons

Options
    • -1
    • +2
    ./lamsfoundation/lams/admin/web/controller/OrgSaveController.java
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -2
    • +2
    ./lamsfoundation/lams/admin/web/controller/UserController.java
    • -1
    • +2
    ./lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
  5. … 20 more files in changeset.
3:06 am

Ernie Ghiglione

LDEV-4932 Adding CSRF protection to admin

- Adding user add/edit/remove/disable

Options
    • -7
    • +8
    ./lamsfoundation/lams/admin/web/controller/UserController.java
  2. … 5 more files in changeset.
Monday 30 Dec 2019
3:44 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF admin

Adding CSRF to delete session management

Options
    • -2
    • +2
    ./lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
  2. … 2 more files in changeset.
1:30 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to admin

Adding CSRF token:

- When adding/editing learning outcomes

- Adding/editing and removing themes

Options
    • -1
    • +2
    ./lamsfoundation/lams/admin/web/controller/ThemeManagementController.java
  2. … 4 more files in changeset.
Sunday 29 Dec 2019
12:04 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF Admin

Fixing policy management toggle. Adding enable/disable toggle for tool management

Options
    • -1
    • +2
    ./lamsfoundation/lams/admin/web/controller/PolicyManagementController.java
    • -3
    • +3
    ./lamsfoundation/lams/admin/web/controller/ToolContentListController.java
  3. … 3 more files in changeset.
Saturday 28 Dec 2019
6:33 pm

Ernie Ghiglione

LDEV-4931 Adding CSRF protection for LAMS Admin

Adding:

- Edit configuration

- Editing timezones

- Add/disable/enable/delete signup pages

- Add/disable/enable/delete integrated server

- Add/activate/deactivate policies

Options
    • -3
    • +4
    ./lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -2
    • +2
    ./lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -1
    • +2
    ./lamsfoundation/lams/admin/web/controller/SignupManagementController.java
  4. … 14 more files in changeset.
Sunday 24 Nov 2019
4:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4907 Password changes corrected in audit

Options
    • -0
    • +3
    ./lamsfoundation/lams/admin/web/controller/UserSaveController.java
  2. … 1 more file in changeset.
Thursday 21 Nov 2019
2:25 pm

Marcin Cieslak

Merge branch 'SP-3'

Options
    • -3
    • +2
    ./lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java
    • -0
    • +10
    ./lamsfoundation/lams/admin/web/form/ExtServerForm.java
  3. … 6 more files in changeset.
Tuesday 19 Nov 2019
1:29 pm

Marcin Cieslak

LDEV-4440 Use redirects rather than forwards so links do not get broken

Options
    • -8
    • +4
    ./lamsfoundation/lams/admin/web/controller/UserSaveController.java
Thursday 10 Oct 2019
12:08 am

Andrey Balan

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

Options
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
  2. … 2 more files in changeset.
12:08 am

Andrey Balan

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

Options
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
  2. … 2 more files in changeset.
Wednesday 09 Oct 2019
10:16 am

Andrey Balan

LDEV-4876 Ability for LTI servers to get userId using alternative request parameter name

Options
    • -0
    • +10
    ./lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
  2. … 5 more files in changeset.
Wednesday 11 Sep 2019
11:40 am

Andrey Balan

LDEV-4869 Add default lesson settings for LTI tool consumers

* Also move all integrations jsps to /integration/ folder

Options
    • -8
    • +12
    ./lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
  2. … 9 more files in changeset.
11:39 am

Andrey Balan

LDEV-4869 Aggregate ServerListController, ServerMaintainController and ServerSaveController into a single ExtServerManagementController

Options
    • -0
    • +186
    ./lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -54
    • +0
    ./lamsfoundation/lams/admin/web/controller/ServerListController.java
    • -91
    • +0
    ./lamsfoundation/lams/admin/web/controller/ServerMaintainController.java
    • -138
    • +0
    ./lamsfoundation/lams/admin/web/controller/ServerSaveController.java
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
11:37 am

Andrey Balan

LDEV-4869 Create common form for ExtServerForm and LtiConsumerForm

Options
    • -0
    • +171
    ./lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java
    • -162
    • +5
    ./lamsfoundation/lams/admin/web/form/ExtServerForm.java
    • -91
    • +6
    ./lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
Wednesday 28 Aug 2019
3:53 pm

Marcin Cieslak

LKC-214 In sysadmin add entry point for blueprint management page

Options
    • -0
    • +1
    ./lamsfoundation/lams/admin/AdminConstants.java
    • -0
    • +9
    ./lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
  3. … 3 more files in changeset.
Monday 15 Apr 2019
3:26 pm

Marcin Cieslak

SP-3 Automatically redirect to logout URL configured in sysadmin

Options
    • -0
    • +10
    ./lamsfoundation/lams/admin/web/form/ExtServerForm.java
  2. … 7 more files in changeset.
Tuesday 26 Feb 2019
11:12 am

Marcin Cieslak

LDEV-4778 Log sysadmin configuration change

Options
    • -10
    • +44
    ./lamsfoundation/lams/admin/web/controller/ConfigController.java
  2. … 3 more files in changeset.
Monday 04 Feb 2019
9:40 am

Marcin Cieslak

LDEV-4767 Move logout logging to higher level methods

This way we know what triggered logout: manual logout, sysadmin or

duplicate session in another browser.

Timeout logout will be silent.

Options
    • -1
    • +15
    ./lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
  2. … 3 more files in changeset.
Tuesday 08 Jan 2019
11:50 pm

Andrey Balan

LDEV-4747 Fix cancel button, which used to save instead of cancel

Options
    • -10
    • +0
    ./lamsfoundation/lams/admin/web/controller/LoginMaintainController.java
  2. … 3 more files in changeset.
Thursday 20 Dec 2018
7:05 pm

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -183
    • +0
    ./lamsfoundation/lams/admin/service/AdminServiceProxy.java
  2. … 51 more files in changeset.
Tuesday 18 Dec 2018
1:37 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4732 User Role screen error handling for no roles reinstated

Options
    • -2
    • +6
    ./lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
3:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4737 Course based lesson delete does not throw exception

Options
    • -7
    • +9
    ./lamsfoundation/lams/admin/web/controller/OrganisationController.java
  2. … 5 more files in changeset.
Friday 14 Dec 2018
7:20 am

Marcin Cieslak

LDEV-4734 Fix org password reset by providing default values to form

Also refactor input names and add extra checks just to be safe.

Options
    • -12
    • +16
    ./lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
    • -14
    • +14
    ./lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java
  3. … 1 more file in changeset.
5:14 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4733 Clone and delete lessons are shown for SysAdmin

Options
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/OrganisationController.java
  2. … 3 more files in changeset.
Tuesday 04 Dec 2018
8:51 am

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from Java code

Options
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java
    • -10
    • +6
    ./lamsfoundation/lams/admin/web/controller/OrgManageController.java
    • -2
    • +2
    ./lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
    • -6
    • +4
    ./lamsfoundation/lams/admin/web/controller/UserBasicListController.java
    • -10
    • +10
    ./lamsfoundation/lams/admin/web/controller/UserController.java
    • -11
    • +5
    ./lamsfoundation/lams/admin/web/controller/UserManageController.java
    • -14
    • +14
    ./lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -9
    • +7
    ./lamsfoundation/lams/admin/web/controller/UserRolesController.java
    • -18
    • +18
    ./lamsfoundation/lams/admin/web/controller/UserSaveController.java
    • -1
    • +1
    ./lamsfoundation/lams/admin/web/controller/UserSearchController.java
    • -6
    • +4
    ./lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java
  13. … 15 more files in changeset.
Thursday 15 Nov 2018
6:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4697 Audit entries filtering by user and remarks

Options
    • -11
    • +21
    ./lamsfoundation/lams/admin/web/controller/LogEventController.java
  2. … 6 more files in changeset.