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 branch 15.0 develop #138

Merged
merged 44 commits into from
Oct 30, 2023
Merged

Merge branch 15.0 develop #138

merged 44 commits into from
Oct 30, 2023

Conversation

shibu-narayanan
Copy link
Member

Changes from OpenSPP getting merged to main branch

jeremi and others added 30 commits March 24, 2023 13:34
@jeremi
Revert "Merge branch '15.0-develop' into 15.0-1.0-develop"
8b26c82 
This reverts commit 7fcf87f, reversing
changes made to 4106ecb.
@jeremi
When creating the program through the zizard, import the registrants …
353b763 
…as enrolled
@gonzalesedwin1123
Fix error in enroll_eligible_registrants in job queue
e883397
@gonzalesedwin1123
Fix error in cycle check_eligibility
37a6d93
@jeremi
Merge pull request #38 from OpenG2P/fix-error-in-enroll-eligible-regi…
9a91f64 
…strants-job-queue

Fix errors in program and cycle beneficiaries enrollment and eligibility verification
@gonzalesedwin1123
Set enroll eligible registrants to job queue
a75796e
@jeremi
Merge pull request #39 from OpenG2P/fix-error-in-enroll-eligible-regi…
4de98a6 
…strants-job-queue

Set enroll eligible registrants to job queue
@openg2pbot
[UPD] Update g2p_programs.pot
aedff3c
@weblate
Update translation files
276a607 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/
@reichie020212
created new root channel for job queue and use it to program and cycle
3081281
@jeremi
Merge pull request #49 from newlogic/program_root_channel
1c099e4 
created new root channel for job queue and use it to program and cycle
@openg2pbot
[UPD] Update g2p_programs.pot
c5fc72e
@weblate
Update translation files
fd98d49 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/
@weblate
Translated using Weblate (Kurdish (Central))
91c090b 
Currently translated at 0.1% (1 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
062fc1c 
Currently translated at 0.5% (3 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
7856812 
Currently translated at 39.5% (222 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
884e12f 
Currently translated at 39.5% (222 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
6022cf8 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
b44c590 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
015f4b4 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
3a6750c 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
a190f0e 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
f224376 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
4b6203f 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
07076f5 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
05bd075 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
8bf33a5 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
98611e7 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
3856310 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
7049286 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
mansour rehman and others added 14 commits August 15, 2023 09:24
@weblate
Translated using Weblate (Kurdish (Central))
02e448b 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
d54e0c3 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
769087a 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
35de633 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
0af9ebe 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
f83010b 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
0a328f1 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
6b99ff6 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@weblate
Translated using Weblate (Kurdish (Central))
7d0bcaf 
Currently translated at 100.0% (561 of 561 strings)

Translation: OpenG2P/g2p_programs
Translate-URL: https://translate.openspp.org/projects/openg2p/g2p_programs/ckb/
@shibu-narayanan
Merge pull request #134 from OpenG2P/15.0-develop
3ceecbe 
PR to update it to latest
@shibu-narayanan
'/15.0-1.0-develop' -> merge-branch-15.0-develop
8323fec
@lalithkota
Merge remote-tracking branch 'upstream/15.0-1.0-develop' into 15.0-1.…
107ef02 
…0-develop-merge
@shibu-narayanan
reverting the merge commit
c6043b1 
Revert "'/15.0-1.0-develop' -> merge-branch-15.0-develop"

This reverts commit 8323fec, reversing
changes made to 3ceecbe.
@shibu-narayanan
Merge pull request #136 from lalithkota/15.0-1.0-develop-merge
628a932 
Merge 15.0-1.0-develop into merge-branch
@shibu-narayanan shibu-narayanan merged commit 7ab4a4f into 15.0-develop Oct 30, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gonzalesedwin1123 gonzalesedwin1123 Awaiting requested review from gonzalesedwin1123

@jeremi jeremi Awaiting requested review from jeremi

Assignees

@shibu-narayanan shibu-narayanan

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@shibu-narayanan @jeremi @gonzalesedwin1123 @openg2pbot @weblate @reichie020212 @lalithkota