Skip to content

Merge Staging to Production - #2699

Merged
MeyerPV merged 98 commits into
masterfrom
staging
Jun 11, 2024
Merged

Merge Staging to Production#2699
MeyerPV merged 98 commits into
masterfrom
staging

Conversation

@elatif2020

@elatif2020 elatif2020 commented Jun 11, 2024

Copy link
Copy Markdown
Contributor

Ticket

  • PR title equals to the ticket name
  • I've added the link to task above in Ticket

What was changed?

  • [ ]

andreymikhadyuk and others added 30 commits April 9, 2024 17:07
@andreymikhadyuk
enable advanced settings for spaces editing
3d5e890
@andreymikhadyuk
add feature flag for updating roles
b889c38
@andreymikhadyuk
create basic advanced settings confirmation modal
470912c
@roienatan
image gallery improvments
fea2bf6
@roienatan
.
fbee94e
@andreymikhadyuk
Merge branch 'dev' into feature/edit-governance-roles
a6c018e
@andreymikhadyuk
create types for preview circles update request
f0e6f82
@andreymikhadyuk
add the logic to form payload for circle update preview request
f64a249
@andreymikhadyuk
add changes displaying
88c4595
@andreymikhadyuk
create utils for payload and circle changes generation
3b40c48
@andreymikhadyuk
add circles update logic
eb28dc1
@andreymikhadyuk
add confirmation checkbox
b641a83
@andreymikhadyuk
add correct check for circle type
b34455c
@roienatan
updates
c743052
@andreymikhadyuk
update generation of circle changes
90f8324
@andreymikhadyuk
pass initial circles to preview generation function
533c38e
@budnik9
link preview implementation
465f537
@roienatan
remove modal padding in mobile
18dab7d
@roienatan
.
c6115f0
@roienatan
.
e6460ea
@andreymikhadyuk
Merge branch 'dev' into feature/edit-governance-roles
5366fd1
@andreymikhadyuk
remove circle type
ed6b806
@andreymikhadyuk
move project governance fetch to ProjectCreation component
e9402f1
@andreymikhadyuk
remove rest circle type logic
6f831df
@andreymikhadyuk
remove advancedSettings field from Project model
f366892
@andreymikhadyuk
update initial "selected" circle state
022957f
@andreymikhadyuk
use correct circles to calculate existing circles
68c4821
@andreymikhadyuk
use different advanced circles synced field logic during editing
a2d668c
@andreymikhadyuk
fix memoization of roles
ca0f105
@andreymikhadyuk
update parent roles usage for advanced settings
08c5421
andreymikhadyuk and others added 27 commits May 14, 2024 12:04
@andreymikhadyuk
fix memberships removal on common leave
92240e0
@andreymikhadyuk
re-fetch projects on common joining
4074e03
@andreymikhadyuk
Merge branch 'dev' into feature/edit-governance-roles
86accac
@andreymikhadyuk
use new type when changing from unsynced to synced
5c17a06
@andreymikhadyuk
update logic of projects data change on leave or join
c43cc50
@andreymikhadyuk
leave items without permissions for all users
e0fa22f
@andreymikhadyuk
add subscription to common member in ProjectFeedItem
bb80506
@andreymikhadyuk
use common member from cache as default value
916d68a
@andreymikhadyuk
Merge pull request #2686 from daostack/feature/link-previews
5c140bc 
Links preview in chat
@andreymikhadyuk
Merge branch 'dev' into bugfix/secret-spaces-appearance
77b2d1f
@andreymikhadyuk
Merge branch 'dev' into feature/edit-governance-roles
5808b7c
@andreymikhadyuk
Merge pull request #2683 from daostack/image-gallery-improvments
4de72cf 
image gallery improvements
@andreymikhadyuk
Merge branch 'dev' into bugfix/secret-spaces-appearance
a7e385f
@andreymikhadyuk
ignore circle visibility check for project feed items
ba33d88
@andreymikhadyuk
allow null as common member subscription data
f88733d
@elatif2020
Merge pull request #2684 from daostack/feature/edit-governance-roles
7fba4b9 
Edit governance roles inheritance - new endpoint
@andreymikhadyuk
Merge branch 'dev' into bugfix/secret-spaces-appearance
c981198 
# Conflicts:
#	src/shared/utils/circles.ts
@andreymikhadyuk
Merge pull request #2692 from daostack/bugfix/secret-spaces-appearance
d8f0c44 
Fix secret spaces visibility
@elatif2020
Merge pull request #2693 from daostack/dev
98d5fcb 
Merge Dev to Staging
@MeyerPV
CW-Hotfix-feature-flag Remove usage feature flag hook in non-componen…
77950f0 
…t function
@MeyerPV
Merge pull request #2694 from daostack/CW-Hotfix-feature-flag-configu…
2ce4420 
…ration

[Hotfix] Feature flag
@MeyerPV
Merge pull request #2695 from daostack/dev
836e6fb 
[Hotfix] Feature flags
@MeyerPV
CW-Message-performance Increase message performance
075a410 
Add useDeepCompareEffect. Restructure component
@elatif2020
reverted the removal of the overflow-y line
358c128
@MeyerPV
Merge pull request #2697 from daostack/CW_fix_chat_scroll_issue
d079665 
Fix mobile chat scroll issue
@MeyerPV
Merge pull request #2696 from daostack/CW-Message-performance
35cdb79 
CW-Message-performance Increase message performance
@MeyerPV
Merge pull request #2698 from daostack/dev
fa455b0 
Dev to staging
@elatif2020
elatif2020 requested a review from MeyerPV June 11, 2024 15:26
@MeyerPV
MeyerPV merged commit 6e54820 into master Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@MeyerPV MeyerPV MeyerPV approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@elatif2020 @MeyerPV @andreymikhadyuk @roienatan @budnik9