lams_admin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4869 Aggregate ServerListController, ServerMaintainController and ServerSaveController into a single ExtServerManagementController

LDEV-4869 Create common form for ExtServerForm and LtiConsumerForm

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

  1. … 2 more files in changeset.
LDEV-4827, LDEV-4844 Toggle question merging is admin panel

  1. … 3 more files in changeset.
LDEV-4834 Use panel-less LO widget in QB question authoring

    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 69 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 50 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# 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/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 54 more files in changeset.
LDEV-4828 Toggle questions transfer and collection creation in sysadmin

  1. … 7 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 94 more files in changeset.
LDEV-4827 Add Question Bank settings to sysadmin

  1. … 3 more files in changeset.
LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 34 more files in changeset.
SP-3 Automatically redirect to logout URL configured in sysadmin

  1. … 5 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

  1. … 85 more files in changeset.
LDEV-4739 Updating translations

  1. … 8 more files in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

    • -2
    • +18
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 62 more files in changeset.
LDEV-4784 Update POI library to 4.0.1 version

  1. … 15 more files in changeset.
LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

  1. … 34 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 43 more files in changeset.
LDEV-4778 Log sysadmin configuration change

  1. … 3 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 43 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 120 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 48 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

  1. … 81 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

    • -5
    • +5
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -8
    • +6
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 377 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 43 more files in changeset.
LDEV-4769 Updating Greek

LDEV-4759 Main page functional

  1. … 35 more files in changeset.
LDEV-4767 LDEV-4755 adding labels

Adding labels for use login/out logs and anti virus config

LDEV-4759 Panels are now cards.

    • -16
    • +16
    ./web/organisation/cloneStart.jsp
  1. … 492 more files in changeset.
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.

  1. … 3 more files in changeset.