Skip to content

Commit

Permalink
Merge pull request #678 from turnitin/develop
Browse files Browse the repository at this point in the history
Release v2023032701
  • Loading branch information
ixiongtii authored Mar 27, 2023
2 parents 1dd753a + 3659dd4 commit a56f032
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 14 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
### Date: 2023-March-27
### Release: v2023032701

#### UI improvements for PHP 8+ users
There was a bug with PHP 8+ users that casued the assignment inbox to be stuck in a loading state. This happens when users select to view grades as a percentage in the
assignment's settings. We have fixed this bug and the assignment inbox loads as normal.

#### PeerMark manager modal size change
We've updated the size of the PeerMark manager modal so that all buttons and features are more accessible without having to scroll to the left or right side of the modal.

---

### Date: 2022-May-12
### Release: v2022051201

Expand Down
2 changes: 1 addition & 1 deletion classes/v1migration/v1migration.php
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
}

/**
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2022051001.min.js.
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2023032701.min.js.
*
* @global type $DB
* @return array return array of assignments to display
Expand Down
8 changes: 4 additions & 4 deletions jquery/plugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
$plugins = array(
'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2022051001.min.js')),
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2022051001.min.js')),
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2022051001.min.js')),
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2023032701.min.js')),
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2023032701.min.js')),
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2023032701.min.js')),
'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),
'turnitintooltwo-uieditable' => array('files' => array('jqueryui-editable.js', 'jqueryui-editable.css')),
'turnitintooltwo-moment' => array('files' => array('moment.js')),
'turnitintooltwo-tooltipster' => array('files' => array('tooltipster.js', 'tooltipster.css')),
'turnitintooltwo-migration_tool' => array('files' => array()) // Required as this is called from V1.
);
);
1 change: 0 additions & 1 deletion jquery/turnitintooltwo-2022051001.min.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@
// Open an iframe light box containing the Peermark Manager.
if ($('.tii_peermark_manager_launch').length > 0) {
$('.tii_peermark_manager_launch').colorbox({
iframe: true, width: "802px", height: "772px", opacity: "0.7", className: "peermark_manager", transition: "none",
iframe: true, width: "915px", height: "772px", opacity: "0.7", className: "peermark_manager", transition: "none",
onLoad: function () {
lightBoxCloseButton();
getLoadingGif();
Expand All @@ -590,7 +590,7 @@
// Open an iframe light box containing the Peermark Reviews.
if ($('.tii_peermark_reviews_launch').length > 0) {
$('.tii_peermark_reviews_launch').colorbox({
iframe: true, width: "802px", height: "772px", opacity: "0.7", className: "peermark_reviews", transition: "none",
iframe: true, width: "915px", height: "772px", opacity: "0.7", className: "peermark_reviews", transition: "none",
onLoad: function () {
lightBoxCloseButton();
getLoadingGif();
Expand Down
1 change: 1 addition & 0 deletions jquery/turnitintooltwo-2023032701.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion jquery/turnitintooltwo_extra-2022051001.min.js

This file was deleted.

File renamed without changes.
Loading

0 comments on commit a56f032

Please sign in to comment.