Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[MBL-17947][Parent] Fixed student colors and theme colors #2579

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[MBL-17947][Parent] Fixed student colors and theme colors #2579

wants to merge 8 commits into from
+247 −91

Commits on Oct 3, 2024

  1. Fixed student colors in Parent.

    @tamaskozmer
    tamaskozmer committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    cac002d View commit details
    Browse the repository at this point in the history

  2. Fix theme color changes.

    @tamaskozmer
    tamaskozmer committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    f97b687 View commit details
    Browse the repository at this point in the history

  3. Fixed color issues when changing student color.

    @tamaskozmer
    tamaskozmer committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    a1d2f24 View commit details
    Browse the repository at this point in the history

  4. Some color fixes.

    @tamaskozmer
    tamaskozmer committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    2122006 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Fixed tests.

    @tamaskozmer
    tamaskozmer committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    8c96dc6 View commit details
    Browse the repository at this point in the history

  2. Fixed tests.

    @tamaskozmer
    tamaskozmer committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d162dcc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into MBL-17947-student-colors-in-parent 

    # Conflicts:
#	apps/parent/src/main/java/com/instructure/parentapp/features/addstudent/AddStudentViewModel.kt
#	apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsViewModel.kt
#	apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarFragment.kt
#	apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesViewModel.kt
#	apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt
#	apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewModel.kt
#	apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsViewModelTest.kt
#	apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesViewModelTest.kt
#	apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardViewModelTest.kt
    @tamaskozmer
    tamaskozmer committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    16543b8 View commit details
    Browse the repository at this point in the history

  4. Resolved conflicts.

    @tamaskozmer
    tamaskozmer committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a7b9cab View commit details
    Browse the repository at this point in the history