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.

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

feat: [FC-0047] Calendar synchronization #330

Merged
merged 37 commits into from
Jul 18, 2024

Commits on Apr 30, 2024

  1. Configuration menu
    Copy the full SHA
    4ff1d21 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge remote-tracking branch 'origin/develop' into feat/calendar

    # Conflicts:
    #	core/src/main/res/values/strings.xml
    #	course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
    #	course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt
    #	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
    #	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesViewModel.kt
    #	course/src/main/java/org/openedx/course/presentation/videos/CourseVideosFragment.kt
    #	course/src/test/java/org/openedx/course/presentation/container/CourseContainerViewModelTest.kt
    PavloNetrebchuk committed May 15, 2024
    Configuration menu
    Copy the full SHA
    7649338 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Configuration menu
    Copy the full SHA
    6e09d35 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Configuration menu
    Copy the full SHA
    ddd9c64 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Configuration menu
    Copy the full SHA
    437febc View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. feat: Create calendar

    PavloNetrebchuk committed May 27, 2024
    Configuration menu
    Copy the full SHA
    90d3f6b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f80afcc View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge remote-tracking branch 'origin/feat/calendar' into feat/calenda…

    …r_sync
    
    # Conflicts:
    #	profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt
    PavloNetrebchuk committed May 28, 2024
    Configuration menu
    Copy the full SHA
    54ab763 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    267b9b4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge remote-tracking branch 'origin/develop' into feat/calendar_sync

    # Conflicts:
    #	app/src/main/java/org/openedx/app/di/ScreenModule.kt
    #	core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
    #	core/src/main/res/values/strings.xml
    #	course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt
    #	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
    #	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesViewModel.kt
    #	course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineViewModel.kt
    #	course/src/main/res/values/strings.xml
    #	course/src/test/java/org/openedx/course/presentation/dates/CourseDatesViewModelTest.kt
    #	profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt
    #	profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt
    PavloNetrebchuk committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e2e2b8d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2f8c9f5 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/develop' into feat/calendar_sync

    # Conflicts:
    #	app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt
    #	core/src/main/java/org/openedx/core/data/storage/CorePreferences.kt
    PavloNetrebchuk committed May 31, 2024
    Configuration menu
    Copy the full SHA
    2093d79 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Configuration menu
    Copy the full SHA
    6a4783d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    afbab8e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9804542 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Configuration menu
    Copy the full SHA
    c774d3b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a4b34e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Configuration menu
    Copy the full SHA
    b44b9a6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    02b0a63 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f371e98 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fe06870 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Configuration menu
    Copy the full SHA
    0fec040 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8abd36b View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Configuration menu
    Copy the full SHA
    8c684e3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2b25e47 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    87c23c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f3f704d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7010639 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Configuration menu
    Copy the full SHA
    f55f2cd View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Configuration menu
    Copy the full SHA
    6508b20 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/develop' into feat/calendar_sync

    # Conflicts:
    #	core/src/main/java/org/openedx/core/system/CalendarManager.kt
    PavloNetrebchuk committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7b7c58e View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Merge remote-tracking branch 'origin/develop' into feat/calendar_sync

    # Conflicts:
    #	app/src/main/java/org/openedx/app/di/ScreenModule.kt
    PavloNetrebchuk committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    631ef1a View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge remote-tracking branch 'origin/develop' into feat/calendar_sync

    # Conflicts:
    #	app/src/main/java/org/openedx/app/AppViewModel.kt
    #	app/src/main/java/org/openedx/app/di/AppModule.kt
    #	core/src/main/java/org/openedx/core/system/notifier/AppUpgradeNotifier.kt
    #	course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
    #	profile/src/main/java/org/openedx/profile/presentation/settings/SettingsViewModel.kt
    PavloNetrebchuk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    6761fb7 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Configuration menu
    Copy the full SHA
    9f7f459 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/develop' into feat/calendar_sync

    # Conflicts:
    #	auth/src/test/java/org/openedx/auth/presentation/signin/SignInViewModelTest.kt
    PavloNetrebchuk committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0b2c381 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Configuration menu
    Copy the full SHA
    71ab360 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Configuration menu
    Copy the full SHA
    5cd96fb View commit details
    Browse the repository at this point in the history