Skip to content

Release/v5.1.29+1929#3976

Merged
yoonlees merged 2139 commits intomasterfrom
release/v5.1.29+1929
Feb 14, 2024
Merged

Release/v5.1.29+1929#3976
yoonlees merged 2139 commits intomasterfrom
release/v5.1.29+1929

Conversation

@mihail-varbanov
Copy link
Collaborator

Upcoming UIUC 5.1 release candidate (application).

roberlander2 and others added 30 commits January 29, 2024 18:32
…-coach-with-lms

[#3891] Integrate Essential Skills Coach with LMS
…o issue/3883-global-settings-updates

* 'develop' of https://github.com/rokwire/illinois-app:
  Update CHANGELOG.md [#3867]
  Load favorite games from Events2 service. [#3867]
  update changelog
  update StreakPanel to show streaks, pauses, pause rewards based on user course and course config
  update essential skills coach strings
  fix access ui updates on ESC get started, fix user progress bugs
  add moduleKey to UserUnit, add isCurrent to AssignmentPanel
  add ESC get started widget with start course button, move ESC key to config
  finish refactoring dashboard ui
  add streak restarts to user course
  load course, user course, user units, display settings in content, add load course request
  filter out modules with no units
  add CourseDisplay class for determining how to display the ESC, start refactoring dashboard to track user progress
  update custom course models to match lms, save user courses and user units in memory after loading

# Conflicts:
#	assets/styles.json
Handle firebase messaging for new settings content widgets
…embers-label

Issue/3912 event detail group members label
roberlander2 and others added 27 commits February 13, 2024 17:24
…nd user unit cache when deleting user course data
…es-and-improvements

[#3971] Essential Skills Coach fixes and improvements
… make type-safe data retrieval, move SuccessTeamMember build from JSON into class definition [#3969].
Get PCP external link, resolve browse panel issue
# Conflicts:
#	CHANGELOG.md
#	README.md
#	SECURITY.md
#	android/app/build.gradle
#	android/app/src/main/java/edu/illinois/rokwire/mobile_access/MobileAccessKeysApiFactory.java
#	android/app/src/main/java/edu/illinois/rokwire/mobile_access/MobileAccessPlugin.java
#	android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
#	android/gradle/wrapper/gradle-wrapper.properties
#	assets/extra/content.attributes.json
#	assets/flexUI.json
#	assets/strings.en.json
#	assets/strings.es.json
#	assets/strings.zh.json
#	assets/styles.json
#	ios/Podfile.lock
#	ios/Runner/GeneratedPluginRegistrant.m
#	lib/ext/Event2.dart
#	lib/ext/RecentItem.dart
#	lib/mainImpl.dart
#	lib/model/Assistant.dart
#	lib/model/Identity.dart
#	lib/service/Assistant.dart
#	lib/service/Auth2.dart
#	lib/service/Config.dart
#	lib/service/DeviceCalendar.dart
#	lib/service/FirebaseMessaging.dart
#	lib/service/Identity.dart
#	lib/service/MobileAccess.dart
#	lib/service/Storage.dart
#	lib/service/Wellness.dart
#	lib/ui/AssistantPanel.dart
#	lib/ui/BrowsePanel.dart
#	lib/ui/RootPanel.dart
#	lib/ui/academics/AcademicsAppointmentsContentWidget.dart
#	lib/ui/academics/AcademicsEventsContentWidget.dart
#	lib/ui/academics/AcademicsHomePanel.dart
#	lib/ui/academics/MedicineCoursesContentWidget.dart
#	lib/ui/academics/SkillsSelfEvaluation.dart
#	lib/ui/academics/SkillsSelfEvaluationOccupationDetails.dart
#	lib/ui/academics/SkillsSelfEvaluationOccupationListPanel.dart
#	lib/ui/academics/SkillsSelfEvaluationResultsPanel.dart
#	lib/ui/appointments/AppointmentScheduleQuestionsPanel.dart
#	lib/ui/appointments/AppointmentScheduleTimePanel.dart
#	lib/ui/appointments/AppointmentScheduleUnitPanel.dart
#	lib/ui/athletics/AthleticsCoachListPanel.dart
#	lib/ui/athletics/AthleticsGameDetailHeading.dart
#	lib/ui/athletics/AthleticsGameDetailPanel.dart
#	lib/ui/athletics/AthleticsHomePanel.dart
#	lib/ui/athletics/AthleticsNewsArticlePanel.dart
#	lib/ui/athletics/AthleticsRosterListPanel.dart
#	lib/ui/athletics/AthleticsScheduleCard.dart
#	lib/ui/athletics/AthleticsTeamPanel.dart
#	lib/ui/attributes/ContentAttributesCategoryPanel.dart
#	lib/ui/attributes/ContentAttributesPanel.dart
#	lib/ui/canvas/CanvasAccountNotificationDetailPanel.dart
#	lib/ui/canvas/CanvasAccountNotificationsPanel.dart
#	lib/ui/canvas/CanvasAnnouncementDetailPanel.dart
#	lib/ui/canvas/CanvasCalendarEventDetailPanel.dart
#	lib/ui/canvas/CanvasCourseAnnouncementsPanel.dart
#	lib/ui/canvas/CanvasCourseAssignmentsPanel.dart
#	lib/ui/canvas/CanvasCourseCalendarPanel.dart
#	lib/ui/canvas/CanvasCourseCollaborationsPanel.dart
#	lib/ui/canvas/CanvasCourseHomePanel.dart
#	lib/ui/canvas/CanvasCourseModulesPanel.dart
#	lib/ui/canvas/CanvasCoursesContentWidget.dart
#	lib/ui/canvas/CanvasFeedbackPanel.dart
#	lib/ui/canvas/CanvasFileSystemEntitiesListPanel.dart
#	lib/ui/canvas/CanvasModuleDetailPanel.dart
#	lib/ui/canvas/CanvasSyllabusHtmlPanel.dart
#	lib/ui/debug/DebugHomePanel.dart
#	lib/ui/debug/mobile_access/DebugMobileAccessHomePanel.dart
#	lib/ui/debug/mobile_access/DebugMobileAccessKeysEndpointSetupPanel.dart
#	lib/ui/debug/mobile_access/DebugMobileAccessLockServicesCodesPanel.dart
#	lib/ui/dining/FoodDetailPanel.dart
#	lib/ui/dining/HorizontalDiningSpecials.dart
#	lib/ui/dining/LocationsWithSpecialPanel.dart
#	lib/ui/events/CompositeEventsDetailPanel.dart
#	lib/ui/events/CreateEventPanel.dart
#	lib/ui/events2/Event2AttendanceDetailPanel.dart
#	lib/ui/events2/Event2AttendanceTakerPanel.dart
#	lib/ui/events2/Event2CreatePanel.dart
#	lib/ui/events2/Event2DetailPanel.dart
#	lib/ui/events2/Event2FiltersPanel.dart
#	lib/ui/events2/Event2HomePanel.dart
#	lib/ui/events2/Event2QrCodePanel.dart
#	lib/ui/events2/Event2SearchPanel.dart
#	lib/ui/events2/Event2SetupAttendancePanel.dart
#	lib/ui/events2/Event2SetupContactPanel.dart
#	lib/ui/events2/Event2SetupRegistrationPanel.dart
#	lib/ui/events2/Event2SetupSponsorshipAndContactsPanel.dart
#	lib/ui/events2/Event2SetupSurveyPanel.dart
#	lib/ui/events2/Event2SurveyResponsesPanel.dart
#	lib/ui/events2/Event2TimeRangePanel.dart
#	lib/ui/events2/Event2Widgets.dart
#	lib/ui/explore/ExploreBuildingDetailPanel.dart
#	lib/ui/explore/ExploreCard.dart
#	lib/ui/explore/ExploreConvergeDetailItem.dart
#	lib/ui/explore/ExploreDiningDetailPanel.dart
#	lib/ui/explore/ExploreEventDetailPanel.dart
#	lib/ui/explore/ExploreMapPanel.dart
#	lib/ui/explore/ExploreMapSelectLocationPanel.dart
#	lib/ui/explore/ExplorePanel.dart
#	lib/ui/explore/ExploreSearchPanel.dart
#	lib/ui/explore/ExploreViewTypeTab.dart
#	lib/ui/gies/CheckListContentWidget.dart
#	lib/ui/groups/GroupAdvancedSettingsPanel.dart
#	lib/ui/groups/GroupAllEventsPanel.dart
#	lib/ui/groups/GroupCreatePanel.dart
#	lib/ui/groups/GroupDetailPanel.dart
#	lib/ui/groups/GroupEventDetailPanel.dart
#	lib/ui/groups/GroupFindEventPanel.dart
#	lib/ui/groups/GroupMemberNotificationsPanel.dart
#	lib/ui/groups/GroupMemberPanel.dart
#	lib/ui/groups/GroupMembersPanel.dart
#	lib/ui/groups/GroupMembersSelectionPanel.dart
#	lib/ui/groups/GroupMembershipQuestionsPanel.dart
#	lib/ui/groups/GroupMembershipRequestPanel.dart
#	lib/ui/groups/GroupMembershipStepsPanel.dart
#	lib/ui/groups/GroupPendingMemberPanel.dart
#	lib/ui/groups/GroupPollListPanel.dart
#	lib/ui/groups/GroupPostCreatePanel.dart
#	lib/ui/groups/GroupPostDetailPanel.dart
#	lib/ui/groups/GroupPostReportAbuse.dart
#	lib/ui/groups/GroupQrCodePanel.dart
#	lib/ui/groups/GroupSearchPanel.dart
#	lib/ui/groups/GroupSettingsPanel.dart
#	lib/ui/groups/GroupTagsPanel.dart
#	lib/ui/groups/GroupWidgets.dart
#	lib/ui/groups/GroupsHomePanel.dart
#	lib/ui/groups/ImageEditPanel.dart
#	lib/ui/guide/GuideCategoriesPanel.dart
#	lib/ui/guide/GuideDetailPanel.dart
#	lib/ui/guide/GuideEntryCard.dart
#	lib/ui/guide/GuideListPanel.dart
#	lib/ui/home/HomeAthleticsEventsWidget.dart
#	lib/ui/home/HomeCheckListWidget.dart
#	lib/ui/home/HomeCreatePollWidget.dart
#	lib/ui/home/HomeFavoritesWidget.dart
#	lib/ui/home/HomeLoginWidget.dart
#	lib/ui/home/HomePanel.dart
#	lib/ui/home/HomeToutWidget.dart
#	lib/ui/home/HomeVoterRegistrationWidget.dart
#	lib/ui/home/HomeWelcomeWidget.dart
#	lib/ui/home/HomeWellnessRingsWidget.dart
#	lib/ui/home/HomeWellnessToDoWidget.dart
#	lib/ui/laundry/LaundryIssueContactInfoPanel.dart
#	lib/ui/laundry/LaundryIssuesDetailPanel.dart
#	lib/ui/laundry/LaundryRequestIssuePanel.dart
#	lib/ui/laundry/LaundryRoomDetailPanel.dart
#	lib/ui/laundry/LaundrySubmittedIssuePanel.dart
#	lib/ui/mtd/MTDStopDeparturesPanel.dart
#	lib/ui/mtd/MTDStopsHomePanel.dart
#	lib/ui/notifications/NotificationsHomePanel.dart
#	lib/ui/notifications/NotificationsInboxPage.dart
#	lib/ui/onboarding/OnboardingAuthLocationPanel.dart
#	lib/ui/onboarding/OnboardingAuthNotificationsPanel.dart
#	lib/ui/onboarding/OnboardingGetStartedPanel.dart
#	lib/ui/onboarding/OnboardingLoginNetIdPanel.dart
#	lib/ui/onboarding/OnboardingLoginPhoneConfirmPanel.dart
#	lib/ui/onboarding/OnboardingLoginPhonePanel.dart
#	lib/ui/onboarding/OnboardingLoginPhoneVerifyPanel.dart
#	lib/ui/onboarding/OnboardingPrivacyStatementPanel.dart
#	lib/ui/onboarding/OnboardingRolesPanel.dart
#	lib/ui/onboarding/OnboardingSportPrefsPanel.dart
#	lib/ui/onboarding/OnboardingUpgradePanel.dart
#	lib/ui/onboarding2/Onboadring2RolesPanel.dart
#	lib/ui/onboarding2/Onboarding2ExploreCampusPanel.dart
#	lib/ui/onboarding2/Onboarding2GetStartedPanel.dart
#	lib/ui/onboarding2/Onboarding2ImprovePanel.dart
#	lib/ui/onboarding2/Onboarding2LoginEmailPanel.dart
#	lib/ui/onboarding2/Onboarding2LoginPhoneOrEmailPanel.dart
#	lib/ui/onboarding2/Onboarding2LoginPhoneOrEmailStatementPanel.dart
#	lib/ui/onboarding2/Onboarding2PersonalizePanel.dart
#	lib/ui/onboarding2/Onboarding2PrivacyPanel.dart
#	lib/ui/onboarding2/Onboarding2PrivacyStatementPanel.dart
#	lib/ui/onboarding2/Onboarding2ResearchQuestionnaireAcknowledgementPanel.dart
#	lib/ui/onboarding2/Onboarding2ResearchQuestionnairePanel.dart
#	lib/ui/onboarding2/Onboarding2ResearchQuestionnairePromptPanel.dart
#	lib/ui/onboarding2/Onboarding2Widgets.dart
#	lib/ui/parking/ParkingEventPanel.dart
#	lib/ui/polls/CreatePollPanel.dart
#	lib/ui/polls/CreateStadiumPollPanel.dart
#	lib/ui/polls/PollBubblePinPanel.dart
#	lib/ui/polls/PollBubblePromptPanel.dart
#	lib/ui/polls/PollBubbleResultPanel.dart
#	lib/ui/polls/PollsHomePanel.dart
#	lib/ui/profile/ProfileDetailsPage.dart
#	lib/ui/research/ResearchProjectProfilePanel.dart
#	lib/ui/research/ResearchProjectsHomePanel.dart
#	lib/ui/settings/SettingsAddIlliniCashPanel.dart
#	lib/ui/settings/SettingsAssessmentsContentWidget.dart
#	lib/ui/settings/SettingsCalendarContentWidget.dart
#	lib/ui/settings/SettingsHomeContentPanel.dart
#	lib/ui/settings/SettingsICardContentWidget.dart
#	lib/ui/settings/SettingsIlliniCashPanel.dart
#	lib/ui/settings/SettingsLanguageContentWidget.dart
#	lib/ui/settings/SettingsLinkedAccountPanel.dart
#	lib/ui/settings/SettingsLoginEmailPanel.dart
#	lib/ui/settings/SettingsLoginPhoneConfirmPanel.dart
#	lib/ui/settings/SettingsLoginPhoneOrEmailPanel.dart
#	lib/ui/settings/SettingsMealPlanPanel.dart
#	lib/ui/settings/SettingsPrivacyCenterContentWidget.dart
#	lib/ui/settings/SettingsPrivacyPanel.dart
#	lib/ui/settings/SettingsProfileContentPanel.dart
#	lib/ui/settings/SettingsSectionsContentWidget.dart
#	lib/ui/wallet/ICardFaqsContentWidget.dart
#	lib/ui/wallet/ICardHomeContentPanel.dart
#	lib/ui/wallet/IDCardContentWidget.dart
#	lib/ui/wellness/WellnessHealthScreenerWidgets.dart
#	lib/ui/wellness/WellnessHomePanel.dart
#	lib/ui/wellness/rings/WellnessRingCreatePane.dart
#	lib/ui/wellness/rings/WellnessRingSelectPredefinedPanel.dart
#	lib/ui/wellness/rings/WellnessRingWidgets.dart
#	lib/ui/wellness/rings/WellnessRingsHomeContentWidget.dart
#	lib/ui/wellness/todo/WellnessToDoHomeContentWidget.dart
#	lib/ui/widgets/CalendarSelectionDialog.dart
#	lib/ui/widgets/PrivacyTicketsDialog.dart
#	lib/ui/widgets/SemanticsWidgets.dart
#	lib/utils/AppUtils.dart
#	libs
#	pubspec.lock
#	pubspec.yaml
@yoonlees yoonlees merged commit 78185e6 into master Feb 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants