Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 7 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

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

  1. … 16 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. … 94 more files in changeset.
LDEV-4932 Add CSRF to monitor and central

  1. … 50 more files in changeset.
LDEV-4871 Fix query string building when requesting a print page

LDEV-4440 Fix URLs in course grouping creation

  1. … 4 more files in changeset.
LDEV-4440 Fix chosen grouping

  1. … 5 more files in changeset.
LDEV-4440 LAMS Central learning link fixed

  1. … 27 more files in changeset.
LDEV-4440 changed paths (monitoring)

LDEV-4440 Central migration

  1. … 52 more files in changeset.
LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

  1. … 4 more files in changeset.
LDEV-4484 Print Grouping Page

  1. … 10 more files in changeset.
LDEV-4457 Create groupings based on file upload

  1. … 15 more files in changeset.
LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

  1. … 12 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

  1. … 156 more files in changeset.
LDEV-4341 1) Add advanced settings that will contain Save button 2) If there are *no* course groupings - jump directly to the create groups page

  1. … 4 more files in changeset.
LDEV-4339 Prevent exception on adding course grouping with non-unique name * Also added a few enhancements like support for saving groupings on pressing Enter key and hiding warning once it's fixed rather than after pressing Save button

  1. … 2 more files in changeset.
LDEV-4341 Ability to save lesson grouping as a course grouping

  1. … 4 more files in changeset.
LDEV-3834: Fix groups to branches mapping dialog. Several other minor fixes.

  1. … 9 more files in changeset.
LDEV-4017: Bootstrap organisation (course) grouping and groups dialogs.

  1. … 9 more files in changeset.
LDEV-3119: Cosmetic changes to course grouping interface.

  1. … 4 more files in changeset.
LDEV-3119: Cosmetic changes to course grouping interface.

  1. … 5 more files in changeset.
LDEV-3707: Use Flashless chosen branching interface in Monitor. Remove obsolete Flash classes and methods. Fix group renaming. General clean up.

  1. … 14 more files in changeset.
LDEV-3120: Add a missing space in unique name creation mechanism.

LDEV-3120: Send to server all learners of an existing group in one batch instead making a separate Ajax call for each of them.

LDEV-3120: Send to server all learners of an existing group in one bach instead making a separate Ajax call for each of them.

LDEV-3269: Revert a unnecessary commit.

LDEV-3269: Add learning design groups management in Admin and utilisation in Flashless Authoring.

  1. … 26 more files in changeset.
LDEV-3119: Fix a bug in check for duplicate organisations. Make group containers less tolerant when dragging users over, so the operator knows exactly where he drops them.

  1. … 1 more file in changeset.