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

Develop to main. Release v2 #538

Merged
merged 62 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
4706755
feat: [FC-0047] Account Settings and Profile split (#397)
IvanStepanok May 7, 2024
2f99d75
chore: added custom back button for downloads view
rnr May 7, 2024
bd9f081
feat: Alert for outdated course calendars on the course home screen
shafqat-muneer May 7, 2024
2ba7a35
Merge branch 'develop' into add-custom-back-for-downloads-view
rnr May 8, 2024
102e44c
chore: Sliding course menu theme enhancement
saeedbashir May 9, 2024
83ce168
Merge pull request #431 from saeedbashir/saeed/sliding_bar_theme
rnr May 9, 2024
5305a92
fix: discovery enabled by default (#433)
volodymyr-chekyrta May 9, 2024
9e18a29
fix: build warnings (#432)
volodymyr-chekyrta May 9, 2024
353f8a0
Merge pull request #430 from edx/add-custom-back-for-downloads-view
forgotvas May 10, 2024
32bf7d9
[iOS] Completion doesn't work for videos in PiP mode. (#414)
forgotvas May 16, 2024
4690b1b
fix: rtl for "arrowLeft" image in Core/Assets (#440)
RawanMatar89 May 22, 2024
a17038f
feat: [FC-0047] calendar synchronization design (#439)
IvanStepanok May 29, 2024
d8a7b46
feat: [FC-0047] Improved Dashboard Level Navigation (#434)
IvanStepanok Jun 1, 2024
a4a85d5
fix: APIs path and archive fixes
saeedbashir Jun 7, 2024
d380551
feat: [FC-0047] Course progress and collapsing sections (#446)
IvanStepanok Jun 7, 2024
0933ddd
Merge pull request #450 from saeedbashir/saeed/fixes
saeedbashir Jun 7, 2024
c39b087
fix: delete local file first since we build url with data from DB (#453)
rnr Jun 11, 2024
5ef90cf
chore: added isModal flag
rnr Jun 11, 2024
3ab245b
feat: Delete old downloaded videos data on device to optimize storage…
shafqat-muneer Jun 12, 2024
dc32ffa
fix: double loading indicator
forgotvas Jun 12, 2024
dcb4134
feat: atlas push pull scripts: FC-55 (#422)
Amr-Nash Jun 12, 2024
3244d1e
chore: fixed wrong name
rnr Jun 13, 2024
daf4834
Merge pull request #457 from edx/fix-modal-view-for-quality-settings
rnr Jun 13, 2024
6fec863
Merge pull request #462 from edx/fix/progressBar
rnr Jun 14, 2024
34cee0d
fix: download loading indicator (#464)
forgotvas Jun 18, 2024
5498a1c
[iOS] Prompt | Confirmation Alert Missing Before Deleting Section-Lev…
forgotvas Jun 20, 2024
b2539a6
feat: [FC-0047] FCM (#461)
volodymyr-chekyrta Jun 21, 2024
ea6e24e
feat: Program Screen Error Handling (#448)
shafqat-muneer Jun 26, 2024
f6c9f47
chore: added Settings button for dashboard type 'list'
rnr Jul 5, 2024
9901340
chore: fix double notification routing and segment callback (#473)
saeedbashir Jul 8, 2024
5d99fba
feat: FullStory Integration and Analytics Implementation (#471)
saeedbashir Jul 8, 2024
15d2ed3
Merge pull request #479 from edx/setting-button-on-dashboard-list
rnr Jul 8, 2024
bd270b7
Fix: CoreData crash (#480)
forgotvas Jul 9, 2024
5f4268c
chore: theme enhancements (#476)
saeedbashir Jul 9, 2024
1e5ab71
fix: fixed header for SE device (#482)
forgotvas Jul 9, 2024
9c18b30
feat: [FC-0047] Calendar synchronization (#466)
IvanStepanok Jul 18, 2024
c291b50
fix: correct typos in localization keys, comments, and button labels …
milad-emami Jul 25, 2024
73e6175
fix: RTL localization for assets and strings (#441)
RawanMatar89 Jul 25, 2024
157ded7
feat: remove uk translations and sync xcode project after `pull_trans…
OmarIthawi Aug 19, 2024
a405dce
feat: [FC-0047] Relative Dates (#505)
IvanStepanok Aug 23, 2024
23c219c
feat: [FC-0047] xBlock offline mode (#474)
IvanStepanok Sep 30, 2024
a183f18
fix: BugFix for PrimaryEnrollment data (#516)
rnr Sep 30, 2024
61b3e37
fix: picker crash when no elements (#63) (#517)
rnr Sep 30, 2024
8dbdcb2
fix: fix iPad crash of alert controller (#74) (#521)
rnr Sep 30, 2024
d5a55fa
fix: video crashes (#70) (#520)
rnr Sep 30, 2024
e85e970
fix: fix coredata crash on primary course (#64) (#518)
rnr Sep 30, 2024
2433b22
fix: core data crash with inverse attribute (#519)
rnr Sep 30, 2024
391caae
fix: fix gallary privacy policy violation crash (#75) (#522)
rnr Sep 30, 2024
c632a01
Feat/migration to ios 18 (#525)
IvanStepanok Oct 3, 2024
004666e
fix: first batch of fix PRs to synchronise with upstream (#526)
rnr Oct 8, 2024
f5e9989
Fix: offline file deletion issue (#527)
IvanStepanok Oct 9, 2024
ca2a32d
feat: add single sign on feature using SAML (#447)
RawanMatar89 Oct 24, 2024
d7ad72a
fix: Part 2 sync to upstream (#530)
rnr Oct 28, 2024
8cfe33f
fix: change EnrollmentsStatus value isActive to recentlyActive (#529)
IvanStepanok Oct 29, 2024
c4fcc19
test: add unit tests for DownloadManager (#532)
IvanStepanok Oct 29, 2024
e76053c
fix: Part 3 sync to upstream (#533)
rnr Oct 30, 2024
af2ba21
build: upgrade fastlane version (#534)
volodymyr-chekyrta Oct 30, 2024
f7eeae8
test: AllCoursesViewModel, PrimaryCoursesViewModel, DatesAndCalendarV…
IvanStepanok Nov 1, 2024
a38730c
fix: decrease facebook sdk version and fix open(url) calling (#537)
rnr Nov 4, 2024
5645bce
[FC-0072] iOS Mobile Plugin Architecture (#528)
IvanStepanok Nov 5, 2024
21e94b6
fix: Part #4 sync to upstream (#540)
rnr Nov 7, 2024
255e2b7
build: update action versions (#541)
volodymyr-chekyrta Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 37 additions & 0 deletions .github/workflows/swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: SwiftLint

on:
workflow_dispatch:

pull_request:

jobs:
lint:
name: Lint
runs-on: macos-latest

concurrency:
# When running on develop, use the sha to allow all runs of this workflow to run concurrently.
# Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
group: ${{ github.ref == 'refs/heads/develop' && format('swiftlint-develop-{0}', github.sha) || format('swiftlint-{0}', github.ref) }}
cancel-in-progress: true

steps:
- uses: nschloe/[email protected]
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-

- name: Setup environment
run:
source ci_scripts/ci_prepare_env.sh && setup_github_actions_environment

- name: SwiftLint
run:
bundle exec fastlane linting
15 changes: 4 additions & 11 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ name: Unit Tests
on:
workflow_dispatch:

push:
branches: [ develop ]

pull_request:

jobs:
tests:
name: Tests
runs-on: macos-14
runs-on: macos-latest

concurrency:
# When running on develop, use the sha to allow all runs of this workflow to run concurrently.
Expand All @@ -24,7 +21,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -35,15 +32,11 @@ jobs:
run:
source ci_scripts/ci_prepare_env.sh && setup_github_actions_environment

- name: SwiftLint
run:
bundle exec fastlane linting

- name: Run tests
run: bundle exec fastlane unit_tests

- name: Archive artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: test-output
Expand All @@ -52,6 +45,6 @@ jobs:
if-no-files-found: ignore

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
flags: unittests
49 changes: 49 additions & 0 deletions .github/workflows/validate-translations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Test Makefile

on:
workflow_dispatch:

push:
branches: [ develop ]

pull_request:

jobs:
translations:
name: "${{ matrix.case.name }}"
runs-on: macos-14

strategy:
matrix:
case:
- name: clean_translations
command: |
make clean_translations;

- name: extract_translations
command: |
make extract_translations;
echo "Ensure combined localization file exists";
test -f I18N/I18N/en.lproj/Localizable.strings;

- name: pull_translations
command:
make pull_translations;
echo "Files are split properly";
test -f Authorization/Authorization/uk.lproj/Localizable.strings;

steps:
- uses: nschloe/[email protected]
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Use Python
uses: actions/setup-python@v5
with:
python-version: 3.11

- name: Install translations requirements
run: make translation_requirements

- name: "${{ matrix.case.name }}"
run: "${{ matrix.case.command }}"
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,11 @@ vendor/
venv/
Podfile.lock
config_settings.yaml
default_config/
default_config/

# Translations ignored files
.venv/
I18N/
*.lproj/
!en.lproj/
/config_script/__pycache__
12 changes: 11 additions & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,24 @@ opt_in_rules: # some rules are only opt-in
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- Pods
- Core/CoreTests
- Authorization/AuthorizationTests
- Course/CourseTests
- Dashboard/DashboardTests
- Discovery/DiscoveryTests
- Discussion/DiscussionTests
- Profile/ProfileTests
- WhatsNew/WhatsNewTests
- Theme/ThemeTests
- vendor
# - Source/ExcludedFolder
- Core/Core/SwiftGen
- Authorization/Authorization/SwiftGen
- Course/Course/SwiftGen
- Discovery/Discovery/SwiftGen
- Dashboard/Dashboard/SwiftGen
- Profile/Profile/SwiftGen
- WhatsNew/WhatsNew/SwiftGen
- Theme/Theme/SwiftGen
# - Source/ExcludedFile.swift
# - Source/*/ExcludedFile.swift # Exclude files with a wildcard
#analyzer_rules: # Rules run by `swiftlint analyze` (experimental)
Expand Down
Loading
Loading