Skip to content

Commit

Permalink
Merge pull request #345 from amansinghbais/atp-merge
Browse files Browse the repository at this point in the history
Implemented: merge threshold-2.0 to the main branch
  • Loading branch information
ravilodhi authored May 29, 2024
2 parents bd9139a + d0f0213 commit a061a25
Show file tree
Hide file tree
Showing 102 changed files with 10,520 additions and 8,484 deletions.
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ VUE_APP_PERMISSION_ID=
VUE_APP_ALIAS={}
VUE_APP_DEFAULT_ALIAS=""
VUE_APP_DEFAULT_LOG_LEVEL="error"
VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login"
VUE_APP_CRON_EXPRESSIONS={"Every 5 minutes":"0 */5 * ? * *","Every 15 minutes":"0 */15 * ? * *","Every 30 minutes":"0 */30 * ? * *","Hourly":"0 0 * ? * *","Every six hours":"0 0 */6 ? * *","Every day at midnight":"0 0 0 * * ?"}
VUE_APP_LOGIN_URL="https://launchpad.hotwax.io/login"
10 changes: 5 additions & 5 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"projects": {
"default": "hotwax-digital-commerce",
"default": "hotwax-digital-commerce-uat",
"production": "digital-commerce-71eb8"
},
"targets": {
"hotwax-digital-commerce": {
"hotwax-digital-commerce-uat": {
"hosting": {
"dev": [
"dev-threshold-management"
"hotwax-atp-dev"
],
"uat": [
"threshold-management-uat"
"hotwax-atp-uat"
]
}
},
"digital-commerce-71eb8": {
"hosting": {
"prod": [
"threshold-management"
"hotwax-atp"
]
}
}
Expand Down
Loading

0 comments on commit a061a25

Please sign in to comment.