Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8cc5f01
Merge pull request #2010 from OneCommunityGlobal/development
one-community Jan 19, 2026
85fc742
Merge pull request #2013 from OneCommunityGlobal/development
one-community Jan 23, 2026
ea7c860
Merge pull request #2033 from OneCommunityGlobal/development
one-community Feb 7, 2026
8272703
Merge pull request #2040 from OneCommunityGlobal/development
one-community Feb 10, 2026
0b8e2bf
Merge pull request #2042 from OneCommunityGlobal/development
one-community Feb 12, 2026
b2f3993
Merge pull request #2050 from OneCommunityGlobal/development
one-community Feb 17, 2026
f1788cb
Merge pull request #2057 from OneCommunityGlobal/development
one-community Feb 19, 2026
577be38
Merge pull request #2061 from OneCommunityGlobal/development
one-community Feb 21, 2026
7a130ca
Merge pull request #2075 from OneCommunityGlobal/development
one-community Feb 28, 2026
2db0fb0
Merge pull request #2086 from OneCommunityGlobal/development
one-community Mar 6, 2026
5d28df2
Merge pull request #2099 from OneCommunityGlobal/development
one-community Mar 12, 2026
cf56d64
Merge pull request #2120 from OneCommunityGlobal/development
one-community Mar 25, 2026
b751912
Merge pull request #2122 from OneCommunityGlobal/development
one-community Mar 25, 2026
fb43e1b
Merge pull request #2124 from OneCommunityGlobal/development
one-community Mar 25, 2026
c0eb448
build: pushed changes in order to pull Masterdon
marcusyi1 Mar 27, 2026
f7b938e
Merge branch 'main' of https://github.com/OneCommunityGlobal/HGNRest …
marcusyi1 Mar 27, 2026
8fe1b7b
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
marcusyi1 Mar 27, 2026
35ae577
add: package update
marcusyi1 Mar 27, 2026
798eaa4
build: changes based on new regulations
marcusyi1 Mar 28, 2026
19682b5
build: changes based on new regulations
marcusyi1 Mar 28, 2026
4832cec
fix: Initial commit for PR
marcusyi1 Apr 3, 2026
8766eba
fix: package-lock merge conflict
marcusyi1 Apr 3, 2026
e0c46af
resolve: accept package-lock.json from development branch
marcusyi1 Apr 3, 2026
0f9f3bc
fix: threshold
marcusyi1 Apr 3, 2026
044b13e
fix: CLI test
marcusyi1 Apr 3, 2026
341d963
Merge branch 'development' into Marcus-finishes-x-auto-poster
marcusyi1 May 7, 2026
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
153 changes: 143 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"node-cache": "^5.1.2",
"node-cron": "^3.0.3",
"node-datetime": "^2.0.3",
"node-fetch": "^2.6.7",
"node-fetch": "^3.3.2",
"node-schedule": "^2.1.1",
"nodemailer": "^7.0.11",
"parse-link-header": "^2.0.0",
Expand All @@ -143,5 +143,6 @@
"watch": [
"/src/**/*"
]
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
2 changes: 0 additions & 2 deletions src/controllers/timeZoneAPIController.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const fetch = require('node-fetch');
const dotenv = require('dotenv');

dotenv.config();
Expand Down
5 changes: 2 additions & 3 deletions src/controllers/timeZoneAPIController.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ jest.mock('../utilities/permissions', () => ({
hasPermission: jest.fn(), // Mocking the hasPermission function
}));

jest.mock('node-fetch');
// eslint-disable-next-line import/no-extraneous-dependencies
const fetch = require('node-fetch');
global.fetch = jest.fn();
const { fetch } = global;

const originalPremiumKey = process.env.TIMEZONE_PREMIUM_KEY;
process.env.TIMEZONE_PREMIUM_KEY = 'mockPremiumKey';
Expand Down
2 changes: 0 additions & 2 deletions src/controllers/userProfileController.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
const moment = require('moment-timezone');
const mongoose = require('mongoose');
const bcrypt = require('bcryptjs');
// eslint-disable-next-line import/no-extraneous-dependencies
const fetch = require('node-fetch');
const moment_ = require('moment');
const jwt = require('jsonwebtoken');
const userHelper = require('../helpers/userHelper')();
Expand Down
Loading
Loading