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

V2 2 0 release #126

Merged
merged 55 commits into from
Dec 4, 2024
Merged

V2 2 0 release #126

merged 55 commits into from
Dec 4, 2024

Conversation

kkatusic
Copy link
Collaborator

@kkatusic kkatusic commented Dec 4, 2024

No description provided.

RamRamez and others added 30 commits July 2, 2024 22:47
@RamRamez
add eslint
d95526b
@RamRamez
add eslint
5a7e13c
@RamRamez
add eslint
007f753
@RamRamez
add eslint
18976dd
@RamRamez
fix eslint errors
8c0aac4
@RamRamez
remove lock file
16b0e81
@RamRamez
Merge branch 'refs/heads/staging' into eslint
8a6ab3a 
# Conflicts:
#	migrations/1718888344202-seedNotificationTypeForNotifyRewardAmount.ts
#	src/services/notificationService.ts
#	src/types/notifications.ts
@RamRamez
fix eslint errors
966fd17
@ae2079
Change date schema to be compatible with ortto schema
10fe752
@RamRamez
Merge pull request #105 from Giveth/eslint
1a469c7 
add eslint
@ae2079
Fix unit test based on changes
fe1c9f9
@ae2079
Pull staging and resolve conflicts
c548c78
@ae2079
Fix lint errors
90528ac
@ae2079
Fix lint errors
5eab9eb
@RamRamez
change main-pipeline
3a8e70b
@Reshzera
feat: change GivethNotificationTypes seed
b530e65
@Reshzera
fix: remove brake line
c8fe8a6
@ae2079
Merge pull request #108 from Giveth/4194-make-orto-schema-compatible
aa3423a 
Change date schema to be compatible with ortto schema
@RamRamez
change Dockerfile
1922f6e
@RamRamez
change Dockerfile to use yarn
385dd19
@RamRamez
Merge pull request #111 from Giveth/change-Dockerfile
5e2fb97 
change Dockerfile
@ae2079
remove userId from notify reward amount ortto request
14a0d7f
@ae2079
Merge pull request #112 from Giveth/4194-make-notification-compatible…
e45646a 
…-with-ortto

remove userId from notify reward amount ortto request
@ae2079
add email to payload for notify reward
d779dfb
@ae2079
Fix tests for notify reward
c36d275
@Reshzera
fix: create migration to change givbacks notification
37cfa70
@Reshzera
Merge pull request #110 from Giveth/feat/issue-2527
42428dc 
feat: change GivethNotificationTypes seed for GivBacks notification
@ae2079
Change scripts to use ts-node for running migrations
64ebbfd
@ae2079
Add tsconfig-paths module to application
9d3823e
@ae2079
ensure dataSource initialize before running migrations
b2678d6
ae2079 and others added 23 commits July 31, 2024 04:49
@ae2079
Allow ts to resolve json modules
c0e9ce3
@ae2079
Run pretest scripts before test migrations
ed56844
@ae2079
Make pretest scripts stand alone
9c6662d
@ae2079
Revert changes on pre-test-scripts.ts
6186262
@ae2079
remove pre-test-scripts from migration commands
45f2075
@ae2079
downgrade typeorm version to fix migration execution
a02e696
@ae2079
run migrations using scripts
0b6839d
@ae2079
Upgrade typeorm version again
5018277
@ae2079
add create test database step to the staging-pipeline.yml
db16aa0
@ae2079
add wait for database step to the staging-pipeline.yml
5ed076b
@ae2079
change database port in the staging-pipeline.yml
a805727
@ae2079
change database name in the staging-pipeline.yml and remove redundant…
135f6d1 
… steps
@ae2079
change database name in the main-pipeline.yml
5a290b8
@ae2079
Merge pull request #113 from Giveth/fix-migrations-execution-issue
1436576 
Fix migrations execution issue
@ae2079
add migration for create Qacc third party
28d21a2
@aminlatifi
Merge pull request #117 from Giveth/addQaccThirdParty
0a22290 
add migration for create Qacc third party
@ae2079
support Qacc on Ortto
ede15cf
@ae2079
Add Qacc to microServices
9ba9425
@ae2079
Merge pull request #119 from Giveth/supportQaccOnOrtto
6d73ff7 
support Qacc on Ortto
@mohammadranjbarz
Resolve merge conflicts
b452f6b
@kkatusic
Feat/User mail verification notification
a69f240
@kkatusic
Merge pull request #124 from Giveth/enable_user_email_verification
3eada61 
Feat/User mail verification notification
@kkatusic
Merge branch 'main' into v2_2_0_release
ada2cff
@kkatusic kkatusic changed the base branch from staging to main December 4, 2024 13:50
RamRamez
RamRamez approved these changes Dec 4, 2024
View reviewed changes
Copy link
Collaborator

@RamRamez RamRamez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kkatusic kkatusic merged commit bf7f055 into main Dec 4, 2024
3 checks passed
@kkatusic kkatusic deleted the v2_2_0_release branch December 4, 2024 14:50
@RamRamez RamRamez mentioned this pull request Dec 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RamRamez RamRamez RamRamez approved these changes

@mateodaza mateodaza Awaiting requested review from mateodaza

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

Successfully merging this pull request may close these issues.
6 participants
@kkatusic @RamRamez @ae2079 @Reshzera @aminlatifi @mohammadranjbarz