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

Develop merge v2 #15

Merged
merged 162 commits into from
Jan 31, 2023
Merged

Develop merge v2 #15

merged 162 commits into from
Jan 31, 2023

Conversation

palindaa
Copy link
Collaborator

No description provided.

palindaa and others added 30 commits January 20, 2023 08:41
@palindaa
change transfer
c28e112 
Signed-off-by: palindaa <palinda@xeptagon.com>
@palindaa
Programme Issue and pending BE change
6ebd0f0
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
facac68 
…registry into dashboard-backend

merging develop
@palindaa
Programme transfer V2 BE change
f4bf886
@palindaa
Credit retirement BE changes
88fbb6b
@palindaa
bug fixes in transfer
56d9322
@palindaa
Issue UI changes
513bab7
@palindaa
uncomment setup country
3c14f1b
@palindaa
Merge pull request #211 from xeptagondev/transfer_v2
90fa060 
Transfer v2
@palindaa
Fix auth action UI issue
7f98265
@palindaa
Merge pull request #212 from xeptagondev/transfer_v2
fae6e5c 
Fix auth action UI issue
@palindaa
Fix transfer request UI
b974cbe
@palindaa
Merge pull request #213 from xeptagondev/transfer_v2
36736ac 
Fix transfer request UI
@dhanushkaxep
deactivated organisation user permission changes
e02114c
@palindaa
Credit send changes
c26f3ee
@palindaa
Fix credit send UI issue
4594818
@palindaa
Send request UI fixes
4ddb42c
@YathurshanT
changes in total credits certified statType in analytics services
3d6da7a
@YathurshanT
total credits certified API integrations
20d2f36
@dhanushkaxep
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
d36d883 
…registry into Bug/Carbon-64-Update-user-issue-fixes

# Conflicts:
#	web/src/Context/UserInformationContext/userInformationContext.tsx
#	web/src/Definitions/InterfacesAndType/userInformationContext.definitions.tsx
#	web/src/Pages/Login/login.tsx
@palindaa
Merge pull request #214 from xeptagondev/Bug/Carbon-64-Update-user-is…
91e4429 
…sue-fixes

deactivated organisation user permission changes
@YathurshanT
Changed regarding overall and mine views in dashboard backend and fro…
af42089 
…nt end
@YathurshanT
changes in implementation for certified credits in front end and backend
059884d
@YathurshanT
merged develop
6150bd7
@palindaa
Merge pull request #215 from xeptagondev/dashboard-backend
48d0d6a 
Dashboard backend
@palindaa
Credit Send and receive UI changes
7991073
@palindaa
Update issue credit amount
a2ffdce
@YathurshanT
changes in credits stats
520fc51
@palindaa
Fix login styling issue
c28e00c
@palindaa
Transfer action changes
f3dc9d8
YathurshanT and others added 27 commits January 30, 2023 14:13
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
6969ecb 
…registry into dashboard-backend

merging develop
@palindaa
Merge pull request #227 from xeptagondev/dashboard-backend
a96ab40 
Dashboard backend
@palindaa
Merge pull request #226 from xeptagondev/homepage-ui
c5749cf 
Homepage UI
@YathurshanT
commented the replicator cordinates generating functions parts
f658724
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
5579992 
…registry into dashboard-backend

merging develop
@palindaa
Merge pull request #228 from xeptagondev/dashboard-backend
1983f3e 
Dashboard backend
@palindaa
Revert "Dashboard backend"
273a145
@palindaa
Merge pull request #229 from xeptagondev/revert-228-dashboard-backend
afc9d1a 
Revert "Dashboard backend"
@dhanushkaxep
cancel deactivated company trasnfer requests
54f15ac
@Uvinduxeptagon
homepage eligibility and resources ui added
6ce0357
@Uvinduxeptagon
changes in homepage resources ui
48354b1
@palindaa
Merge pull request #231 from xeptagondev/homepage-ui
546d2c7 
Homepage UI
@YathurshanT
Changes regarding sending unique transfer locations
741f6ea
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
d38b426 
…registry into dashboard-backend

merging develop
@YathurshanT
Changes regarding sending unique transfer locations
0d485a2
@palindaa
Merge pull request #232 from xeptagondev/dashboard-backend
e2cb99f 
Dashboard backend
@palindaa
Fix minor bugs
b6d37fe
@palindaa
Fix styling issue
4d35ef0
@Uvinduxeptagon
language updated
f261841
@dhanushkaxep
bug fixes
0bc062a
@palindaa
Merge pull request #233 from xeptagondev/homepage-ui
d493d93 
language updated
@palindaa
Rename analytics endpoint to stats
68e6ead
@palindaa
Merge pull request #230 from xeptagondev/feat/Carbon-70-transfer-requ…
78035c6 
…est-cancellation

Feat/carbon 70 transfer request cancellation
@palindaa
Fix error message case sensitive
1047524
@palindaa
fix retirment developer changes
fba60ee
@palindaa
Fix logo related UI issues
def8832
@palindaa
Fix transfer send owner account issue
9f802f0
@palindaa palindaa merged commit 378d037 into develop Jan 31, 2023
mbelinsky pushed a commit that referenced this pull request Apr 11, 2023
@dhanushkaxep
Merge pull request #15 from xeptagondev/carbon-133
51efbe3 
Removed the country validation in user adding service
palindaa added a commit that referenced this pull request Sep 3, 2023
@palindaa
Merge pull request #15 from xeptagondev/feature/carbon-276
45ab356 
Feature/carbon 276
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@palindaa @YathurshanT @dhanushkaxep @Uvinduxeptagon