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

Master new release-6.0.1 into master #349

Merged
merged 31 commits into from
Jul 2, 2024
Merged

Master new release-6.0.1 into master #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7783926
chore: program name like search added
manojSRawat Mar 23, 2023
8656429
co-316: changes
Apr 5, 2023
76eadb1
Issue #0000 fix: Node version updated to 14
vinukumar-vs May 16, 2023
ea2deec
Issue co-441 fix:Program-service: Cert issue to access dev sunbird en…
vaivk369 May 18, 2023
ee871cf
Issue co-441 merge: Merge pull request #306 from vaivk369/vk-6
vinukumar-vs May 18, 2023
ff41ee4
Issue #CO-229 merge: revert Merge pull request #305 from Sunbird-coKr…
vinukumar-vs May 18, 2023
e88c403
Issue #CO-441 fix: commented out json2csv code as it is not working
vaivk369 May 19, 2023
f292de0
Issue #CO-441 merge: Merge pull request #307 from vaivk369/vk-6
vinukumar-vs May 19, 2023
01c309c
Issue co-441 fix: module node_rsa not found
vaivk369 May 23, 2023
41e93c1
Issue co-441 merge: Merge pull request #308 from vaivk369/vk-6
vinukumar-vs May 23, 2023
0b37f67
Updated branch from Release-6.0.0
May 30, 2023
d9b4c13
json2csv replaced with json-2-csv
Jun 20, 2023
242426c
packgae.json and package-lock.json updated
Jun 21, 2023
44b6a62
removed needless code
Jun 21, 2023
f36ae2b
Issue #CO-486 merge: Merge pull request #311 from rekhaLuezoid/CO-486
vinukumar-vs Jun 21, 2023
020844e
Revert "Issue #CO-486"
vaivk369 Jun 22, 2023
0b71b3f
Merge pull request #312 from vaivk369/revert-311-CO-486
pallakartheekreddy Jun 22, 2023
3ca4452
json2csv as per node 12
Jun 23, 2023
d32d8b3
Issue #CO-486 merge: Merge pull request #313 from rekhaLuezoid/json2csv
vinukumar-vs Jun 29, 2023
9c4622e
code optimization
Jul 5, 2023
381a91e
Issue #co-496 fix: resmsgid for nomination is null
vaivk369 Jul 11, 2023
974a5a6
Issue #co-496 fix: resmsgid for nomination is null
vaivk369 Jul 11, 2023
968c665
Request tracibility
vaivk369 Jul 11, 2023
4b2ee58
Issue #co-496 merge: Merge pull request #314 from vaivk369/vk-rel-6.0.0
vinukumar-vs Jul 12, 2023
ba0fe42
Merge branch 'release-6.0.0' of github.com:Sunbird-Ed/program-service…
Jul 12, 2023
f180ae8
generated data optimisation
Jul 12, 2023
4774ce6
added reverted code
Jul 13, 2023
9220d28
approved and unapproved question
Jul 14, 2023
33321c3
Issue #CO-321 merge: Merge pull request #304 from manojSRawat/program…
vinukumar-vs Aug 24, 2023
905e421
Issue #CO-229 merge: Merge pull request #303 from rekhaDevs/co-316
vinukumar-vs Aug 24, 2023
469f2cd
Merge remote-tracking branch 'upstream/release-6.0.1' into master-new
shubhambansaltarento Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM circleci/node:8.11.2-stretch as build
MAINTAINER "Kartheek Palla" "kartheekp@ilimi.in"
FROM node:12.20.1-slim
MAINTAINER "Ekstep" "info@ekstep.in"
USER root
COPY src /opt/program-service/
WORKDIR /opt/program-service/
RUN npm install
CMD ["node", "app.js", "&"]
CMD ["node", "app.js", "&"]
Loading
Loading