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

Merge back 1.2 to develop #287

Merged
merged 51 commits into from
Feb 3, 2025
Merged

Merge back 1.2 to develop #287

merged 51 commits into from
Feb 3, 2025

Conversation

shibu-narayanan
Copy link
Member

No description provided.

lalithkota and others added 30 commits August 23, 2024 22:13
@lalithkota
Added 1.2 branch for openg2p-programs
85bf851 
Signed-off-by: Lalith Kota <[email protected]>
@PSNAppz
Fix payment_manager test
1f8cdca
@PSNAppz
Refactoring: add payment_status_check_interval field to payment manager
6d18f11
@PSNAppz
Envelope summary will be displayed as HTML by default
10f3e41
@lalithkota
Program Reg Info Json to dict fix. Nested json fix
0204732 
Signed-off-by: Lalith Kota <[email protected]>
@PSNAppz
Update batch_has_completed once send_payment is successful.
56f2c78
@PSNAppz
Fix total_no_of_payments_across_batches to fetch from cycle instead o…
cf6961b 
…f program
@PSNAppz
pre-commit fixes
f6e757d
@shibu-narayanan
Merge pull request #261 from PSNAppz/17.0-develop
dd781c8 
Fixed: No. of beneficiaries from cycle instead of program + UI improvements & Unit test fixes
@openg2pbot
[UPD] Update g2p_payment_g2p_connect.pot
ce7198f
@shibu-narayanan
Update test-pre-requirements.txt
b4aec7d
@shibu-narayanan
Merge pull request #266 from lalithkota/17.0-develop
73dd294 
Program Reg Info Json to dict fix. Nested json fix
@RamakrishnaVellala
reimbursement portal added
2210924
@Q-Niranjan
Update the CSS for the Create and Action buttons
2fb923b
@lalithkota
VCI Fixed no image error
8855b07 
Signed-off-by: Lalith Kota <[email protected]>
@lalithkota
Merge remote-tracking branch 'origin/17.0-1.2' into 17.0-1.2
883eeb4 
Signed-off-by: Lalith Kota <[email protected]>
@lalithkota
Fixed dependencies
82da647 
Signed-off-by: Lalith Kota <[email protected]>
@shibu-narayanan
Merge pull request #276 from lalithkota/17.0-1.2
bb7b3fe 
VCI Fixed no image error
@openg2pbot
[UPD] Update g2p_program_registrant_info.pot
3e660d2
@Q-Niranjan
Move the action_preview widget to the g2p-documents base module
541ad49
@mkumar-02
ODK Importer: Fixed Program enrollement issue
6477725 
Signed-off-by: Manoj Kumar <[email protected]>
@shibu-narayanan
Merge pull request #272 from mkumar-02/17.0-1.2-odk-program-enroll-fix
cd65622 
ODK Importer: Fixed Program enrollement issue
@openg2pbot
[UPD] Update g2p_programs.pot
6e8ed9d
@openg2pbot
[UPD] Update g2p_odk_importer_program.pot
a6a2ab4
@Q-Niranjan
changes in button css
080e733
@Q-Niranjan
Map the form dynamically based on programid
996a609
@Q-Niranjan
Resolved css issue
fee8772
@shibu-narayanan
Merge pull request #275 from Q-Niranjan/17.0-1.2-theme
1fe2664 
Update the CSS for the Create and Action buttons
@shibu-narayanan
Merge pull request #278 from Q-Niranjan/17.0-1.2-formioImprove
5da1836 
Map the form dynamically based on programid
@shibu-narayanan
Merge pull request #277 from Q-Niranjan/17.0-1.2-jsIssueFix
99f46ad 
Move the action_preview widget to the g2p-documents base module
openg2pbot and others added 21 commits December 23, 2024 10:05
@openg2pbot
[UPD] Update g2p_formio.pot
c72e7c9
@shibu-narayanan
Merge branch '17.0-1.2' into 17.0-1.2
816b1ec
pre commit run
4cec0e8
@openg2pbot
[UPD] Update g2p_programs.pot
217425a
@openg2pbot
[UPD] Update g2p_reimbursement_portal.pot
a182f40
@shibu-narayanan
Merge pull request #279 from OpenG2P/17.0-1.2-ramakrishna
05e938b 
Changes from PR 269 with code corrections
@Q-Niranjan
Added Background Processing Using Job Queue
a35bff3
@Q-Niranjan
Resolve issue
1a7ed33
@Q-Niranjan
Change 'Imported Regsitrants' to 'Imported Registrants'
930700d
@Q-Niranjan
Added formio default js options
db9c53b
@shibu-narayanan
Merge pull request #281 from Q-Niranjan/17.0-1.2-formioJsOptions
ad9f966 
Added formio default js option
@openg2pbot
[UPD] Update g2p_formio.pot
a633cef
@shibu-narayanan
Merge pull request #282 from Q-Niranjan/17.0-1.2-Impoter
3e27b1b 
Added Background Processing Using Job Queue For SR-Impoter
@openg2pbot
[UPD] Update g2p_social_registry_importer.pot
5e2978d
@Q-Niranjan
Deleted resconfig XML file and ir_cron data file to streamline config…
7e6ed74 
…uration
@shibu-narayanan
Merge pull request #283 from Q-Niranjan/17.0-1.2
3ef1059 
Deleted resconfig XML file and ir_cron data file.
@openg2pbot
[UPD] Update g2p_social_registry_importer.pot
29e739d
@Q-Niranjan
Added JSON formatter for upcoming responses
7e754d7
@Q-Niranjan
Added jq to the manifest and removed camel_converter
0e20398
@shibu-narayanan
Merge pull request #284 from Q-Niranjan/17.0-1.2
6a9ca72 
 Added JSON formatter for upcoming social registry API response.
@openg2pbot
[UPD] Update g2p_social_registry_importer.pot
14531c2
@shibu-narayanan shibu-narayanan merged commit 31b3d08 into 17.0-develop Feb 3, 2025
10 checks passed
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
@shibu-narayanan @lalithkota @PSNAppz @openg2pbot @RamakrishnaVellala @Q-Niranjan @mkumar-02