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

Cicd fix #54

Merged
merged 52 commits into from
Mar 15, 2023
Merged

Cicd fix #54

merged 52 commits into from
Mar 15, 2023

Conversation

palindaa
Copy link
Collaborator

No description provided.

dhanushkaxep and others added 30 commits March 9, 2023 11:02
@dhanushkaxep
changes
cad6ab2
@dhanushkaxep
login redirect issue fixes
35d36d3
@palindaa
Add docker deploy
00c84eb
@palindaa
Update region issue
da7644b
@palindaa
Temp changes to trigger pipeline
06d03c2
@palindaa
Add dev docker compose and image
018714b
@Uvinduxeptagon
undp address issue fixed
9f99098
@YathurshanT
moved error messages of addCompany to en.json file
3046516
@palindaa
Map key build
b809db3
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
6d7f89e 
…registry into carbon_87_frontend
@YathurshanT
moved texts in addUser to en.json file
85ff235
@dhanushkaxep
Merge pull request #398 from xeptagondev/homepage-ui
4e6f322 
undp address issue fixed
@YathurshanT
moved compnayManagement file texts into en.json
8b51e67
@YathurshanT
moved texts in programmeManagement to en.json
2d2d860
@YathurshanT
moved texts in userManagement into en.json
ade01ae
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
2df15bd 
…registry into carbon_87_frontend
@dhanushkaxep
fix retire/send/request button permissons
2c5a729
@palindaa
Merge pull request #397 from xeptagondev/feat/carbon-113-login-redirect
bc0975e 
Feat/carbon 113 login redirect issue fixed
@dhanushkaxep
remove hardcoded map token
2e70d6e
@dhanushkaxep
Merge pull request #399 from xeptagondev/carbon_87_frontend
f7a28d2 
Carbon 87 frontend
@dhanushkaxep
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
8471957 
…registry into Bug/cabron-91

# Conflicts:
#	web/src/Pages/ProgrammeView/programmeView.tsx
@dhanushkaxep
fixed timeline credit unfrozen count issue
0f8af79
@dhanushkaxep
add space for company role in reg email
965d823
@palindaa
Merge pull request #401 from xeptagondev/Bug/cabron-91
88161b0 
Bug/cabron 91 - organisation reactivation issues
@palindaa
Merge pull request #400 from xeptagondev/feat/carbon-113-login-redirect
9c66597 
remove hardcoded map token
@YathurshanT
Fixed the toolTip issue in certifier view stats card
8baf85a
@YathurshanT
Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-…
aa7af61 
…registry into carbon_87_frontend
@YathurshanT
Showing only auth programmes in certifier mine view programmeLocation…
e8dffbe 
…s map legend
@palindaa
Merge pull request #402 from xeptagondev/carbon_87_frontend
381d004 
Fixed the toolTip issue in certifier view stats card
@YathurshanT
fixed prettier formatting issues
d21040b
dhanushkaxep and others added 22 commits March 13, 2023 12:48
@dhanushkaxep
Merge pull request #403 from xeptagondev/carbon_87_frontend
364f6f8 
fixed prettier formatting issues
@Uvinduxeptagon
removed async differ in inline scripts and removed unwanted title tag…
e58fdf3 
… in the header
@dhanushkaxep
Merge pull request #404 from xeptagondev/homepage-ui
bbfdddc 
removed async differ in inline scripts and removed unwanted title tag…
@YathurshanT
localization changes in backend
844fe10
@YathurshanT
fixed prettier issue in dashboard
0b0452e
@palindaa
Fix deactivate local issue
37643c8
@dhanushkaxep
Merge pull request #405 from xeptagondev/carbon_87_backend
a0a67b5 
Carbon 87 backend
@palindaa
Revert "Carbon 87 backend"
b04c231
@palindaa
Merge pull request #406 from xeptagondev/revert-405-carbon_87_backend
be77ef2 
Revert "Carbon 87 backend"
@palindaa
Revert "Revert "Carbon 87 backend""
a9e46d4
@palindaa
Merge pull request #407 from xeptagondev/revert-406-revert-405-carbon…
34d1a90 
…_87_backend

Revert "Revert "Carbon 87 backend""
@dhanushkaxep
fix login redirect to user profile issue
dc07fcf
@palindaa
Merge pull request #408 from xeptagondev/Bug-login-redirect-to-user-p…
76fc618 
…rofile-issue

fix login redirect to user profile issue
@YathurshanT
fix package issue
9704b31
@YathurshanT
Merge pull request #409 from xeptagondev/serverless
7b49702 
fix package issue
@YathurshanT
localization changes backend
ba37ca1
@palindaa
Merge pull request #410 from xeptagondev/serverless
a65ec7b 
localization changes backend
@palindaa
Fix local freeze issue
9dcd320
@palindaa
remove main branch deploy to develop deploy
466c7bc 
Signed-off-by: palindaa <palinda@xeptagon.com>
@palindaa
Docker only if develop branch
1d34de5
@palindaa
Rename docker compose files
4e37170
@palindaa
Merge branch 'main' into cicd_fix
bd3fb20
@palindaa palindaa requested a review from mbelinsky March 15, 2023 17:14
mbelinsky
mbelinsky reviewed Mar 15, 2023
View reviewed changes
web/src/Pages/Dashboard/dashboard.tsx
Copy link
Contributor

Choose a reason for hiding this comment

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

Will these text items become variables?

@mbelinsky mbelinsky merged commit a9e40f9 into main Mar 15, 2023
@mbelinsky mbelinsky deleted the cicd_fix branch March 15, 2023 21:29
mbelinsky pushed a commit that referenced this pull request Apr 11, 2023
@palindaa
Merge pull request #54 from xeptagondev/develop
6443efb 
merge latest changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mbelinsky mbelinsky mbelinsky approved these changes

Assignees

@mbelinsky mbelinsky

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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