-
Notifications
You must be signed in to change notification settings - Fork 117
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Horizon] Merge master #3181
Open
szabinst
wants to merge
153
commits into
feature/horizon
Choose a base branch
from
feature/horizon-merge-master
base: feature/horizon
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[Horizon] Merge master #3181
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ignore-commit-lint]
…e screen (#2920) refs:MBL-17951 affects: Student, Parent release note: none test plan:
refs: MBL-17939 affects: Teacher release note: Fixed LTI content embedded in RCE submissions not displaying in SpeedGrader. test plan: See ticket
…elector screen not reacting to cancel when in error or loading states. (#2926) refs: MBL-17877 affects: Student release note: Fixed cancel not working on offline sync picker screen while the screen is loading or displaying an error. Fixed offline sync picker failing to load in some cases. test plan: See ticket.
[ignore-commit-lint]
refs: MBL-17936 affects: Student, Teacher release note: Fixed an issue that prevented sending messages to more than 100 people. test plan:
[ignore-commit-lint]
refs: MBL-17893 affects: Parent release note: Fixed alert list not refreshing after an alert is read or dismissed.
[ignore-commit-lint]
… the cursor to the end. (#2927) refs: MBL-17838 affects: Student, Teacher release note: Fixed issues after pasting long text in inbox messages.
refs: MBL-17976 affects: Student, Teacher, Parent release note: none
refs: MBL-17890 affects: Student, Teacher, Parent release note: none test plan:
refs: MBL-17959 affects: Teacher, Student release note: Inbox messages now show attached audio/video comments. test plan:
refs: MBL-17944 affects: Student, Parent release note: Fixed some assignments being visible on the grades screen when the shouldn't be. test plan:
refs: MBL-18022 affects: none release note: none test plan: Tests to pass
refs: MBL-17936 affects: Teacher, Student release note: none test plan:
refs: MBL-17971 affects: Student, Teacher release note: Custom calendar frequency screen now reuses the currently selected frequency. test plan: See PR description
refs: MBL-17864 affects: Student, Teacher, Parent release note: none test plan: - Log in to the beta environment. - Link course files to where rich content is enabled using a web browser. (Assignment, quiz, discussion, announcement, page, syllabus, calendar event) - Check the linked files is they are still working from the apps.
[ignore-commit-lint]
…2955) * Fix inbox tab badge value * Update count on main queue refs: MBL-18045 affects: Student,Teacher release note: Fix the issue of missing Indicator of unread messages on Inbox icon test plan: See PR description * Fix unit tests * Update InboxMessageInteractorLiveTests.swift * Update FileSubmissionItemsUploadStarterTests.swift
…e mode (#2957) refs: MBL-17988 affects: Student,Teacher release note: Fix the issue of annotation bar move button being cut off on landscape mode. test plan: See PR description
refs: MBL-17910 affects: Student, Teacher, Parent release note: none test plan: See PR description
[ignore-commit-lint]
* refs: MBL-18034 affects: Student release note: none Implement Offline Assignments E2E test case. Add new helper (OfflineHelper) for Offline mode dialog (and future usage). * Minor refactor. * Update .gitignore * Refactor according to PR comments. * Remove Package.resolved from gitignore * Delete screenlog.0 * Delete Brewfile.lock.json * Remove trailing whitespaces in whitespace-only lines. * Remove trailing whitespace from DashboardHelper
refs: MBL-14876 affects: Student, Teacher release note: Added filtering and sorting options to assignment list. test plan: See ticket
refs: MBL-17935 affects: Student release note: Fixed downloaded files not being available in offline mode. test plan: - Have a course with a course file added to modules. - Sync the course with files for offline mode. - Go offline. - Enter the course's Files menu. - Check if the downloaded file displays in the file viewer. - Go to Modules, test if the linked file in the module item it will display in offline mode. - Smoke test if files are working in online mode.
* Fix startup crash refs: MBL-18078 affects: Student, Teacher release note: Fixed a startup crash which occurred on some devices. test plan: * Fix always visible Back Online banner
[ignore-commit-lint]
refs: MBL-18051 affects: Student, Teacher release note: Fixed the end of inbox messages not being displayed in some cases. test plan: See PR description
…ections (#3157) refs: MBL-18480 affects: Student, Teacher release note: none
#3156) refs: MBL-18443 affects: Teacher release note: none
…t Screen (#3162) refs: MBL-18373 affects: Student release note: none
…ement (#3147) refs: MBL-18462 affects: Student, Parent release note: none test plan: - Check if changing the grading filter and closing the modal with the done button announces that the filter was applied.
refs: MBL-18409 affects: Parent release note: none test plan: - Ensure expanded state value is announced on student switcher button.
refs: MBL-18375 affects: Student release note: none test plan: - Start an offline sync. - Voiceover focus should jump to the sync progress card after modals have been dismissed and shuld announce what's happening.
…se Message Form (#3163) refs: MBL-18356 affects: Parent release note: None
…changing tabs on drawer (#3168) refs: MBL-18385 affects: Student release note: None test plan: See ticket.
refs: MBL-18348 affects: Student, Teacher release note: none
…t-in the app (#3118) refs: MBL-18549 affects: Student, Teacher release note: Fixed the issue where app doesn't refresh shown page properly after switching to another app
refs: MBL-18567 affects: Teacher release note: Fixed long tap gesture on rubric ratings in SpeedGrader. test plan: - As the teacher create an assignment that has a rubric associated to it. - Log in to the Canvas Teacher app on an iOS device. - Open the assignment. - Navigate to the Submissions section and select a student to grade. - Swipe up to open the grade details section. - Tap and hold on one of the rubric ratings. - The rating's title should be revealed.
refs: MBL-18460 affects: Student, Teacher, Parent release note: none
refs: MBL-18400 affects: Parent release note: None.
…is selected (#3164) refs: MBL-18415 affects: Parent release note: None
refs: MBL-18358 affects: Parent release note: None test plan: See ticket.
…ge-master # Conflicts: # .github/CODEOWNERS # .gitignore # .swiftlint.yml # Core/Core/Common/CommonModels/AppEnvironment/AppEnvironment.swift # Core/Core/Common/CommonUI/InstUI/Views/NavigationBarTitleView.swift # Core/Core/Common/CommonUI/NavigationBar/SwiftUI/NavigationBarViewModifiers.swift # Core/Core/Common/CommonUI/NavigationBar/UIKit/ColoredNavViewProtocol.swift # Core/Core/Common/CommonUI/NavigationBar/UIKit/TitleSubtitleView.swift # Core/Core/Common/CommonUI/NavigationBar/UIKit/TitleSubtitleView.xib # Core/Core/Common/CommonUI/NavigationBar/UIKit/UINavigationBarExtensions.swift # Core/Core/Common/CommonUI/Presenter/ColoredNavViewProtocol.swift # Core/Core/Common/CommonUI/SwiftUIViews/UIKitSwiftUIBridging/CoreHostingController.swift # Core/Core/Common/CommonUI/SwiftUIViews/UIKitSwiftUIBridging/UINavigationControllerTheme.swift # Core/Core/Common/CommonUI/UIViews/ItemPickerViewController.swift # Core/Core/Common/CommonUI/UIViews/TitleSubtitleView.swift # Core/Core/Common/CommonUI/UIViews/TitleSubtitleView.xib # Core/Core/Common/Extensions/Foundation/CGSizeExtensions.swift # Core/Core/Common/Extensions/Foundation/StringExtensions.swift # Core/Core/Common/Extensions/UIKit/UINavigationBarExtensions.swift # Core/Core/Extensions/HTTPCookieExtensions.swift # Core/Core/Extensions/LoggerExtensions.swift # Core/Core/Extensions/UINavigationBarExtensions.swift # Core/Core/Features/Assignments/AssignmentList/View/AssignmentGroupView.swift # Core/Core/Features/Assignments/AssignmentList/View/AssignmentListPreferencesScreen.swift # Core/Core/Features/Assignments/AssignmentList/View/AssignmentListScreen.swift # Core/Core/Features/Courses/SmartSearch/View/CourseSmartSearchFilterEditorView.swift # Core/Core/Features/Courses/SmartSearch/View/CourseSmartSearchHelpView.swift # Core/Core/Features/Files/View/FileDetails/FileDetailsViewController.swift # Core/Core/Features/Grades/View/GradeFilterView.swift # Core/Core/Features/Grades/ViewModel/GradeFilterViewModel.swift # Core/Core/Features/Inbox/AttachmentPicker/Model/AttachmentPickerInteractor/AttachmentPickerInteractor.swift # Core/Core/Features/Inbox/AttachmentPicker/Model/AttachmentPickerInteractor/AttachmentPickerInteractorLive.swift # Core/Core/Features/Inbox/AttachmentPicker/Model/AttachmentPickerInteractor/AttachmentPickerInteractorPreview.swift # Core/Core/Features/Inbox/AttachmentPicker/View/AttachmentPickerView.swift # Core/Core/Features/Inbox/AttachmentPicker/ViewModel/AttachmentPickerViewModel.swift # Core/Core/Features/Inbox/ComposeMessage/View/UITextViewWrapper.swift # Core/Core/Features/Planner/CalendarEvent/View/SelectEventFrequencyScreen.swift # Core/Core/Features/Planner/CalendarSelector/View/SelectCalendarScreen.swift # Core/Core/Features/Search/View/CoreSearchHostingController.swift # Core/Core/Features/Search/View/SearchViewsProvider.swift # Core/Core/Features/SubmitAssignmentExtension/View/SubmitAssignmentExtensionView.swift # Core/Core/Inbox/AttachmentPicker/Model/AttachmentPickerInteractor/AttachmentPickerInteractor.swift # Core/Core/InstUI/Views/ListSectionHeader.swift # Core/Core/Presenter/ColoredNavViewProtocol.swift # Core/Core/Resources/Localizable.xcstrings # Core/Core/SwiftUIViews/UIKitSwiftUIBridging/UINavigationControllerTheme.swift # Core/Core/UIViews/TitleSubtitleView.swift # Core/Core/UIViews/TitleSubtitleView.xib # Core/CoreTests/Common/CommonUI/CoreWebView/View/CoreWebViewTests.swift # Core/CoreTests/Common/CommonUI/NavigationBar/UIKit/TitleSubtitleViewTests.swift # Core/CoreTests/Common/CommonUI/NavigationBar/UIKit/UINavigationBarExtensionsTests.swift # Core/CoreTests/Common/CommonUI/UIViews/BottomSheetPickerViewControllerTests.swift # Core/CoreTests/Common/CommonUI/UIViews/TitleSubtitleViewTests.swift # Core/CoreTests/Common/Extensions/Foundation/StringExtensionsTests.swift # Core/CoreTests/Common/Extensions/UIKit/UINavigationBarExtensionsTests.swift # Core/CoreTests/Common/Extensions/WebKit/WKWebViewExtensionsTests.swift # Core/CoreTests/CoreWebView/View/CoreWebViewControllerTests.swift # Core/CoreTests/Extensions/UINavigationBarExtensionsTests.swift # Core/CoreTests/Features/Courses/SmartSearch/Model/CourseSmartSearchViewAttributesTests.swift # Core/CoreTests/Features/Grades/Model/GradeListInteractorLiveTests.swift # Core/CoreTests/Features/Inbox/AttachmentPicker/Model/AttachmentPickerInteractorLiveTests.swift # Core/CoreTests/Features/Inbox/AttachmentPicker/ViewModel/AttachmentPickerViewModelTests.swift # Core/CoreTests/Features/Planner/CalendarEvent/Model/Helpers/RecurrenceRule+SelectionDescriptionTests.swift # Core/CoreTests/Features/SubmitAssignmentExtension/Model/API/AssignmentPickerListServiceTests.swift # Core/CoreTests/TestHelpers/CoreTestCase.swift # Core/CoreTests/UIViews/TitleSubtitleViewTests.swift # Parent/Parent/Dashboard/DashboardViewController.swift # Parent/Parent/Localizable.xcstrings # Parent/Parent/ObserverAlerts/Model/UseCase/DismissObserverAlert.swift # Student/Student/StudentAppDelegate.swift # Teacher/Teacher/Routes.swift # Teacher/Teacher/SpeedGrader/SubmissionCommentList.swift # packages/HorizonUI/Sources/HorizonUI/Sources/Components/Cards/HorizonUI.Card.Stroybook.swift # packages/HorizonUI/Sources/HorizonUI/Sources/Components/Controls/HorizonUI.Controls.swift
…ge-master [ignore-commit-lint]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges latest changes from master.