lams-github

lams_admin

Clone Tools

Stats

Commits this week: 0
Total Committers: 23
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
Sunday 09 Feb 2020
9:56 pm

Marcin Cieslak

Merge branch 'LDEV-4962' into v4.0

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
Saturday 08 Feb 2020
5:17 am

Andrey Balan

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

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -2
    • +8
    ./web/remove.jsp
    • -13
    • +12
    ./web/userlist.jsp
  4. … 1 more file in changeset.
4:38 am

Andrey Balan

LDEV-4965 Avoid reseting lessonFinishUrl on saving ltiConsumer

Options
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
    • -3
    • +3
    ./web/integration/ltiConsumer.jsp
Thursday 06 Feb 2020
8:50 pm

Marcin Cieslak

LKC-225 Add configuration settings for Workflow Automation

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -8
    • +13
    ./src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java
  4. … 33 more files in changeset.
11: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
    ./src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java
  4. … 36 more files in changeset.
Tuesday 28 Jan 2020
2:38 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
2:35 pm

Marcin Cieslak

LDEV-4957 Confirm before deleting integrated server or LTI consumer

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +6
    ./web/integration/ltiConsumerList.jsp
    • -1
    • +6
    ./web/integration/serverlist.jsp
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./web/403.jsp
    • -1
    • +0
    ./web/404.jsp
    • -0
    • +5
    ./web/WEB-INF/web.xml
    • -2
    • +1
    ./web/error.jsp
    • -1
    • +0
    ./web/login.jsp
  6. … 168 more files in changeset.
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
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -16
    • +21
    ./web/user.jsp
    • -1
    • +2
    ./web/userChangePass.jsp
  5. … 91 more files in changeset.
6:01 am

Andrey Balan

Merge branch 'LDEV-4932'

# Conflicts:

# lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java

Options
    • -9
    • +8
    ./web/toolcontent/toolcontentlist.jsp
  2. … 3 more files in changeset.
Wednesday 08 Jan 2020
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -13
    • +18
    ./web/user.jsp
  2. … 50 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
    • -14
    • +25
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
  3. … 18 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
9:00 pm

Ernie Ghiglione

LDEV-4932 removing multipart encoding

There are plenty of form we set the multipart encoding for uploading files, but no files are uploaded. This has implications for CSRF tokens. So we remove the enctype="multipart/form-data" for all the authoring forms that aren't needed.

Options
    • -1
    • +1
    ./web/loginmaintain.jsp
  2. … 14 more files in changeset.
Wednesday 01 Jan 2020
7:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -1
    • +1
    ./web/config/editconfig.jsp
    • -1
    • +1
    ./web/integration/ltiConsumer.jsp
    • -1
    • +1
    ./web/integration/servermaintain.jsp
    • -1
    • +1
    ./web/loginmaintain.jsp
    • -1
    • +1
    ./web/policies/editPolicy.jsp
    • -1
    • +1
    ./web/signupmanagement/add.jsp
    • -1
    • +1
    ./web/themeManagement.jsp
    • -1
    • +1
    ./web/timezoneManagement.jsp
  9. … 34 more files in changeset.
7:12 am

Ernie Ghiglione

LDEV-4932 fix checkbox toggle issue

Options
    • -1
    • +1
    ./web/userorgrole.jsp
6:36 am

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
    ./src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -1
    • +1
    ./web/config/editconfig.jsp
    • -1
    • +1
    ./web/integration/ltiConsumer.jsp
    • -1
    • +0
    ./web/integration/serverlist.jsp
    • -1
    • +1
    ./web/integration/servermaintain.jsp
    • -1
    • +1
    ./web/loginmaintain.jsp
    • -0
    • +1
    ./web/orgPasswordChange.jsp
    • -0
    • +1
    ./web/organisation/cloneStart.jsp
    • -0
    • +1
    ./web/organisation/createOrEdit.jsp
    • -1
    • +2
    ./web/organisation/deleteAllLessons.jsp
    • -4
    • +4
    ./web/organisation/list.jsp
    • -1
    • +1
    ./web/policies/editPolicy.jsp
  16. … 9 more files in changeset.
Tuesday 31 Dec 2019
10:24 am

Ernie Ghiglione

LDEV-4932 Add CSRF for admin

- Adding CSRF to delete preview lessons

Options
    • -1
    • +1
    ./web/cleanupPreviewLessons.jsp
  2. … 1 more file in changeset.
10:06 am

Ernie Ghiglione

LDEV-4932 Adding CSRF protection to admin

- Adding user add/edit/remove/disable

Options
    • -7
    • +8
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -1
    • +1
    ./web/disabledusers.jsp
    • -8
    • +5
    ./web/remove.jsp
    • -3
    • +3
    ./web/user.jsp
    • -7
    • +3
    ./web/usersearchlist.jsp
  6. … 1 more file in changeset.
12:06 am

Marcin Cieslak

LDEV-4936 Fix layout for tool groups in sysadmin

Options
    • -5
    • +0
    ./web/css/learningLibraryGroup.scss
    • -5
    • +2
    ./web/includes/javascript/learningLibraryGroup.js
    • -0
    • +5
    ./web/toolcontent/learningLibraryGroup.jsp
    • -34
    • +14
    ./web/toolcontent/toolcontentlist.jsp
Monday 30 Dec 2019
10:44 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF admin

Adding CSRF to delete session management

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
    • -4
    • +2
    ./web/sessionmaintain.jsp
  3. … 1 more file in changeset.
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
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java
    • -3
    • +3
    ./web/themeManagement.jsp
  3. … 3 more files in changeset.
Sunday 29 Dec 2019
7:04 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF Admin

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

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java
    • -3
    • +3
    ./web/policies/policies.jsp
    • -9
    • +8
    ./web/toolcontent/toolcontentlist.jsp
  5. … 1 more file in changeset.
1:33 am

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
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -4
    • +19
    ./web/WEB-INF/web.xml
    • -2
    • +2
    ./web/config/editconfig.jsp
    • -2
    • +2
    ./web/integration/ltiConsumer.jsp
    • -10
    • +4
    ./web/integration/ltiConsumerList.jsp
    • -4
    • +5
    ./web/integration/serverlist.jsp
    • -3
    • +3
    ./web/integration/servermaintain.jsp
    • -2
    • +2
    ./web/loginmaintain.jsp
    • -3
    • +3
    ./web/policies/editPolicy.jsp
    • -2
    • +2
    ./web/signupmanagement/add.jsp
    • -3
    • +4
    ./web/signupmanagement/list.jsp
    • -0
    • +1
    ./web/taglibs.jsp
    • -2
    • +2
    ./web/timezoneManagement.jsp
  17. … 1 more file in changeset.
Friday 20 Dec 2019
3:42 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

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

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

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

# lams_learning/conf/language/lams/ApplicationResources_en_AU.properties

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

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

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

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_en_AU.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.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_el_GR.properties

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

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

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

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

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

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

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

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

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

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

# lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

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

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

# lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

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

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

# lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 14 more files in changeset.
Thursday 19 Dec 2019
9:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4931 Adding ids to support Admin tests

Options
    • -1
    • +1
    ./web/userlist.jsp
    • -1
    • +1
    ./web/usersearchlist.jsp
  3. … 6 more files 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
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +19
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -25
    • +39
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 14 more files in changeset.
Monday 09 Dec 2019
9:15 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -6
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -25
    • +42
    ./conf/language/lams/ApplicationResources_es_ES.properties
9:01 pm

Marcin Cieslak

LDEV-4844 Add missing labels

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties