lams_admin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4739 Updating labels

Greek, Spanish, Norwegian

LDEV-4995 Course manager changes

Important changes for accessibility, specially in tablesorter and page tag. New labels to better reflect new layout -work in progress

    • -26
    • +30
    ./web/organisation/createOrEdit.jsp
LDEV-4995 redesign course management page

Simplify course management page

Fixed issues with readmore-js and jquery3+

Add textarea to edit/create course

  1. … 2 more files in changeset.
LDEV-4995 Changes to course management layout

    • -0
    • +61
    ./web/WEB-INF/tags/Widget.tag
    • -112
    • +263
    ./web/organisation/list.jsp
LDEV-4997 Initial migration of Doku tool to Etherpad as central service

  1. … 32 more files in changeset.
LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

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

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

  1. … 31 more files in changeset.
LDEV-4995 Improvements course management

    • -119
    • +139
    ./web/organisation/createOrEdit.jsp
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

  1. … 6 more files in changeset.
LDEV-4995 Moving breadcrumb to Page tag

LDEV-4995 Moving breadcrumb to Page tag

    • -12
    • +8
    ./web/integration/servermaintain.jsp
  1. … 5 more files in changeset.
LDEV-4440 Retain original create date when editing an user is sysadmin

LDEV-4440 Add missing create date to user edit form in sysadmin

LDEV-4995 update user editing form

LDEV-4995 Upgrading admin to Bootstrap4 and accessibility improvements

    • -36
    • +52
    ./web/integration/extLessonForm.jsp
    • -72
    • +66
    ./web/integration/ltiConsumer.jsp
    • -40
    • +43
    ./web/integration/servermaintain.jsp
  1. … 1 more file in changeset.
LDEV-4995 Move lams_admin to bootstrap4 and accessibility improvements

    • -57
    • +87
    ./web/integration/ltiConsumerList.jsp
    • -28
    • +63
    ./web/integration/serverlist.jsp
  1. … 9 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 189 more files in changeset.
LDEV-4975 Upgrade jquery to version 3.4.1

LDEV-4975 Upgrade jquery to version 3.4.1

  1. … 16 more files in changeset.
LKC-225 Make container auto sync time and interval configurable

  1. … 1 more file in changeset.
LKC-225 Make integrated server name configurable

  1. … 1 more file in changeset.
Merge branch 'LDEV-4962' into v4.0

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

  1. … 1 more file in changeset.
LDEV-4965 Avoid reseting lessonFinishUrl on saving ltiConsumer

LKC-225 Add configuration settings for Workflow Automation

  1. … 1 more file in changeset.
LDEV-4962 Introduce complex portrait UUIDs

  1. … 33 more files in changeset.
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

  1. … 36 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

LDEV-4957 Confirm before deleting integrated server or LTI consumer

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

  1. … 168 more files in changeset.
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

  1. … 91 more files in changeset.