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

Anubhav 1 #468

Open
wants to merge 175 commits into
base: master
Choose a base branch
from
Open

Anubhav 1 #468

wants to merge 175 commits into from

Conversation

anubshrma
Copy link

No description provided.

prabhatsuyaldeloitte and others added 30 commits May 15, 2024 19:27
@prabhatsuyaldeloitte
added hp tenant
e12eb56
@prabhatsuyaldeloitte
Merge pull request #1 from upyoguddhp/prabhat_1
42aafb7 
added hp tenant
@sourmaity
change for hp tenant
81a50ba
@sourmaity
Merge branch 'testing_21may24' of https://github.com/upyoguddhp/upyog…
388b729 
…-mdms-data into sourav_1

# Conflicts:
#	data/hp/ACCESSCONTROL-ROLES/roles.json
#	data/hp/DataSecurity/MaskingPatterns.json
#	data/hp/DataSecurity/SecurityPolicy.json
#	data/hp/PropertyTax/OwnerShipCategory.json
#	data/hp/TradeLicense/ReminderPeriods.json
#	data/hp/TradeLicense/TradeType.json
#	data/hp/common-masters/OwnerShipCategory.json
#	data/hp/egf-master/FinancialYear.json
#	data/hp/tenant/tenants.json
@sourmaity
Merge pull request #2 from upyoguddhp/sourav_1
eedb4a1 
Sourav 1
@bbharali
Merge pull request #3 from upyoguddhp/testing_21may24
d62a0f7 
Testing 21may24 to Bhaskar_1 for latest MDMS Data
@bbharali
Merge pull request #6 from upyoguddhp/bhaskar_1
ecc3a39 
Merge pull request #3 from upyoguddhp/testing_21may24
@prabhatsuyaldeloitte
AccessoriesCategoryPart2 added
0cf086e
@bbharali
Merge pull request #8 from upyoguddhp/testing_21may24
f91746f 
Merge changes from Testing_1 to Bhaskar_1
@prabhatsuyaldeloitte
Merge pull request #9 from upyoguddhp/bhaskar_1
fa2dd6d 
Bhaskar 1
@bbharali
Merge pull request #10 from upyoguddhp/testing_21may24
1188d49 
Merge pull request #9 from upyoguddhp/bhaskar_1
@bbharali
Commit MDMS District ULB Ward Mapping
f8acdd3
@bbharali
Merge branch 'bhaskar_1' of https://github.com/upyoguddhp/upyog-mdms-…
7cefdb1 
…data into bhaskar_1
@bbharali
Merge pull request #11 from upyoguddhp/bhaskar_1
a7ade41 
Bhaskar 1 to Testing Branch for MDMS data
@prabhatsuyaldeloitte
employee department and designation added
fbe1335
@prabhatsuyaldeloitte
corrected tenantId for shimla
f44b31a
@prabhatsuyaldeloitte
Merge pull request #12 from upyoguddhp/prabhat_1
31ef9d5 
employee department and designation added
@bbharali
Merge pull request #13 from upyoguddhp/prabhat_1
0c82705 
Prabhat 1
@bbharali
Commit Districts data into MDMS
b7ca0c4
@bbharali
Merge branch 'bhaskar_1' of https://github.com/upyoguddhp/upyog-mdms-…
79f243e 
…data into bhaskar_1
@bbharali
Merge pull request #14 from upyoguddhp/bhaskar_1
315c206 
Bhaskar 1 to Prabhat 1
@bbharali
Commit Category changes into MDMS
84c6b30
@bbharali
Merge pull request #15 from upyoguddhp/bhaskar_1
2cafb68 
Commit Category changes into MDMS
@prabhatsuyaldeloitte
department and designation
39fc990
@prabhatsuyaldeloitte
Merge branch 'testing_21may24' into prabhat_1
f3fede5
@upyoguddhp
Merge pull request #16 from upyoguddhp/bhaskar_1
42cf677 
Bhaskar 1
@prabhatsuyaldeloitte
Update BusinessServiceMasterConfig.json
ce49774
@prabhatsuyaldeloitte
Update Category1.json
cd0f564
@prabhatsuyaldeloitte
Merge pull request #17 from upyoguddhp/prabhat_1
8bc0527 
HP state level TL workflow disabled
@prabhatsuyaldeloitte
zuul related role action to URLs configured
7403af1
Divsharma2407 and others added 30 commits October 22, 2024 10:22
@Divsharma2407
mapping updated for pet,site,garbage
d751a46
@Divsharma2407
Merge pull request #70 from upyoguddhp/prabhat_1
70042e5 
mapping updated for pet,site,garbage
@Divsharma2407
Merge pull request #71 from upyoguddhp/testing_21may24
30c4c9b 
Testing 21may24
@Divsharma2407
trade mapping fixes
517b675
@Divsharma2407
Merge pull request #72 from upyoguddhp/prabhat_1
5e73654 
trade mapping fixes
@Divsharma2407
Merge pull request #73 from upyoguddhp/testing_21may24
71d10a3 
Testing 21may24
@bbharali
Merge pull request #74 from upyoguddhp/testing_21may24
98a6ebd 
Testing 21may24
@Divsharma2407
access_token not mapped
f008900
@Divsharma2407
Merge pull request #75 from upyoguddhp/prabhat_1
a7854c6 
access_token not mapped
@Divsharma2407
Merge pull request #76 from upyoguddhp/testing_21may24
f17df28 
Testing 21may24
@Divsharma2407
acess added for advt create
c6566ef
@Divsharma2407
Merge pull request #77 from upyoguddhp/prabhat_1
f90761f 
acess added for advt create
@Divsharma2407
Merge pull request #78 from upyoguddhp/testing_21may24
66f0381 
Testing 21may24
@bbharali
Merge pull request #79 from upyoguddhp/testing_21may24
8aa40d7 
Testing 21may24
@prabhatsuyaldeloitte
pet fees and json updated
88bbd21
@bbharali
Merge pull request #80 from upyoguddhp/testing_21may24
d27c007 
Testing 21may24
@bbharali
Commit Latest changes in Roles
9bdb3fe
@bbharali
Merge branch 'bhaskar_1' of https://github.com/upyoguddhp/upyog-mdms-…
b541106 
…data into bhaskar_1
@bbharali
Commit RoleAction json for Assets
d26ce21
@prabhatsuyaldeloitte
rodhu zones added
23fd3a8
@bbharali
Commit Change in Action role json file
c22b6ef
@bbharali
Commit Employee changes into MDMS
c4bf93d
@Divsharma2407
zone added for all ULB
fa2d65e
@Divsharma2407
meat shop trade catgeory updated as per cleint
3132819
@bbharali
Merge pull request #81 from upyoguddhp/bhaskar_1
8dc877a 
Bhaskar 1
@bbharali
Merge pull request #82 from upyoguddhp/testing_21may24
314c5ff 
Testing 21may24
@anubshrma
Merge branch 'prabhat_1' of https://github.com/upyoguddhp/upyog-mdms-…
48be511 
…data into Anubhav_1
@anubshrma
Merge branch 'testing_21may24' of https://github.com/upyoguddhp/upyog…
deaaf51 
…-mdms-data into Anubhav_1
@anubshrma
Merge branch 'master' of https://github.com/upyoguddhp/upyog-mdms-data …
cc3ab3b 
…into Anubhav_1
@anubshrma
trade and garbage json files for fee structure
634e3e4
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.
7 participants
@anubshrma @prabhatsuyaldeloitte @sourmaity @bbharali @upyoguddhp @hemant908deloitte @Divsharma2407