Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Make main default again #1248

Merged
merged 57 commits into from
Jul 13, 2023
Merged

Make main default again #1248

merged 57 commits into from
Jul 13, 2023

Conversation

abhinavkgrd
Copy link
Member

@abhinavkgrd abhinavkgrd commented Jul 13, 2023 •
edited
Loading

Description

Removing the dev branch, making the main the default branch, having the dev branch, and putting things for testing is another friction. Not worth the benefits

So, merging the unmerged changing on the dev, and removing dev

abhinavkgrd and others added 30 commits July 3, 2023 12:22
@abhinavkgrd
separate out incomingShare Viewer and Collaborator CollectionSummaryType
19d146c
@abhinavkgrd
added support for showing collab album in collection selector add to …
029bd7f 
…album
@abhinavkgrd
updated usage of CollectionSummaryType.incomingShare to newer separat…
17b7776 
…e types
@abhinavkgrd
refactor
53b245b
@abhinavkgrd
refactor CollectionSummaryType determination and fallback to incoming…
a69848d 
… share viewer if not a collab incoming share
@abhinavkgrd
show incoming item on home screen
580f4ab
@abhinavkgrd
run post handleCollectionOps even when toProcessFiles are zero
d63eaf3
@abhinavkgrd
show shared file in search screen
9407848
@abhinavkgrd
remove isIncomingSharedCollection logic and use isOwnFile logic to sh…
d1b9367 
…ow icons in PhotoViewer
@abhinavkgrd
fix function name casing
677d943
@abhinavkgrd
add archive/unarchive option to shared album
8d70cdc
@abhinavkgrd
add sharedMagicMetadata property and type
4f3fe68
@abhinavkgrd
Add to collab album support (#1221)
d8559c5
@abhinavkgrd
fix sync crowdin schedule run
45ea3a6
@abhinavkgrd
fix sync Crowdin schedule run (#1235)
0cb4892
@abhinavkgrd
update isArchived to handle shared Collection metadata visibility state
0cad125
@abhinavkgrd
support archiving shared album and handle incoming sharee-metadata pr…
7161bc8 
…operty
@abhinavkgrd
remove noFallthroughCasesInSwitch false
decc8d5
@abhinavkgrd
reenabled strictBindCallApply tsc check
85f59c2
@abhinavkgrd
replace isArchived with separate isArchivedFile and isArchivedCollection
3a91c72
@abhinavkgrd
Merge branch 'dev' into incoming-item-home-screen
7c24db4
@abhinavkgrd
Merge branch 'incoming-item-home-screen' into add-support-archive-sha…
eefa66f 
…red-album
@abhinavkgrd
migrate code
14fa472
@abhinavkgrd
fix isArchivedCollection
10751ec
@abhinavkgrd
clean up code
1bb9d9c
@abhinavkgrd
pause video beforeChanging to next one
0e7fb97
@abhinavkgrd
rename collectionSummary latestFile to coverFile
174d5af
@abhinavkgrd
update getCollectionLatestFiles to getCollectionCoverFiles
3ad621b
@abhinavkgrd
keep both latest and cover File
8f18aef
@abhinavkgrd
revert unneeded change
cde730a
abhinavkgrd and others added 23 commits July 10, 2023 14:36
@abhinavkgrd
fix incomingShareViewer sort order
67e565e
@abhinavkgrd
show download and share quick share option
bf6ebb2
@abhinavkgrd
fix build
2dd65cb
@abhinavkgrd
revert folder name change
4c075d6
@abhinavkgrd
refactor and fix issue getCollectionCoverFiles
01b0d1b
@abhinavkgrd
update comment
d4fa666
@abhinavkgrd
fix getCollectionCoverFiles
11f4d8c
@abhinavkgrd
Show incoming shared files in ALL section (#1224)
b267faf
@abhinavkgrd
Pinned album (#1239)
0ef6648
@abhinavkgrd
Merge branch 'dev' into add-support-archive-shared-album
7b4a609
@abhinavkgrd
Merge branch 'dev' into album-cover
5ae3a99
@abhinavkgrd
allow shared file to latest and cover photo for all section
3775ecd
@abhinavkgrd
add option to SingleInputForm to prevent caching of filed values
8b53e55
@abhinavkgrd
Add support to archive shared album (#1236)
adf5b16
@abhinavkgrd
Merge branch 'main' into dev
e62e652
@abhinavkgrd
Merge branch 'dev' into album-cover
d809c82
@abhinavkgrd
removed "strictPropertyInitialization": false,
91879d0
@abhinavkgrd
Add option to prevent Input field caching (#1240)
96decde
@abhinavkgrd
Album cover (#1238)
ea92b1a
@abhinavkgrd
Enable stricter typescript (#1241)
61c59e9
@dependabot
Bump semver from 6.3.0 to 6.3.1
c8a72f7 
Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](npm/node-semver@v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@abhinavkgrd
Bump semver from 6.3.0 to 6.3.1 (#1242)
577e2b8
@abhinavkgrd
Pause video on navigate (#1237)
1ed4a6e
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ abhinavkgrd
❌ dependabot[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@abhinavkgrd abhinavkgrd changed the title make main default again Make main default again Jul 13, 2023
@abhinavkgrd abhinavkgrd requested a review from ua741 July 13, 2023 13:49
@abhinavkgrd abhinavkgrd merged commit c3a09ed into main Jul 13, 2023
@abhinavkgrd abhinavkgrd deleted the dev branch August 10, 2023 16:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ua741 ua741 ua741 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@abhinavkgrd @CLAassistant @ua741