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

Merging develop-userTypeFix in develop #1761

Merged
merged 46 commits into from
Mar 23, 2024
Merged

Merging develop-userTypeFix in develop #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c813d2a
merged develop
AVtheking Mar 22, 2024
d0a2ddb
fixed conflicts
AVtheking Mar 22, 2024
06d4254
fixed conflicts
AVtheking Mar 22, 2024
49511c6
fix
AVtheking Mar 22, 2024
e9fd0f9
merged
AVtheking Mar 22, 2024
f7aa899
Merge branch 'develop' into develop
AVtheking Mar 22, 2024
129b472
fix
AVtheking Mar 22, 2024
4c239fc
fix count of lines test
varshith257 Mar 22, 2024
15e8f00
fix linting error
AVtheking Mar 22, 2024
aa95575
Merge branch 'develop' of https://github.com/AVtheking/talawa-admin i…
AVtheking Mar 22, 2024
4eae604
Update LoginPage.tsx
varshith257 Mar 22, 2024
bf1da01
Update MemberDetail.test.tsx
varshith257 Mar 22, 2024
2ac964f
Update MemberDetail.tsx
varshith257 Mar 22, 2024
447d5f3
Update OrganizationPeople.test.tsx
varshith257 Mar 22, 2024
7f9b91c
Update OrganizationPeople.tsx
varshith257 Mar 22, 2024
697bb4d
Update Organizations.tsx
varshith257 Mar 22, 2024
cca9571
Merge branch 'develop' into develop
palisadoes Mar 22, 2024
db44591
fixed linting error
AVtheking Mar 22, 2024
518732c
fixed linting error
AVtheking Mar 22, 2024
06a43c3
fixed linting error
AVtheking Mar 22, 2024
c117417
fixed formatting error
AVtheking Mar 22, 2024
59792ce
uncommented husky file
AVtheking Mar 22, 2024
ede29c0
fix same branch name
AVtheking Mar 22, 2024
36efe60
fix
AVtheking Mar 22, 2024
de93c2e
removed eslint-disable
AVtheking Mar 22, 2024
4978032
fix query
AVtheking Mar 22, 2024
ac0f29b
fix test
varshith257 Mar 22, 2024
158202b
Merge branch 'fix/develop' of https://github.com/AVtheking/talawa-adm…
varshith257 Mar 22, 2024
b5a67d0
fix test
varshith257 Mar 22, 2024
34b06f5
fix lint
varshith257 Mar 23, 2024
2c93820
Add image and email fields to LOGIN_MUTATION
pranshugupta54 Mar 23, 2024
22e4f02
fix home test
pranshugupta54 Mar 23, 2024
e8b4213
Remove adminApproved field and update login test
pranshugupta54 Mar 23, 2024
9a0e0c8
Add adminApproved field to LOGIN_MUTATION
pranshugupta54 Mar 23, 2024
a576b18
fix
AVtheking Mar 23, 2024
de6313e
Merge branch 'fix/develop' of https://github.com/AVtheking/talawa-adm…
AVtheking Mar 23, 2024
bddd212
fixed organization test
AVtheking Mar 23, 2024
29280ad
fixed member detail test
AVtheking Mar 23, 2024
4c3da95
fix
AVtheking Mar 23, 2024
f42a545
fixed remaining test
AVtheking Mar 23, 2024
b731d79
Added more test for partial coverage
pranshugupta54 Mar 23, 2024
ac637ad
removed logs
AVtheking Mar 23, 2024
f95607b
Merge branch 'fix/develop' of https://github.com/AVtheking/talawa-adm…
AVtheking Mar 23, 2024
76a5cf3
removed logs
AVtheking Mar 23, 2024
b19d3ae
removed logs
AVtheking Mar 23, 2024
01a5f97
Update adminApproved field in Queries.ts and UserTableItem.test.tsx
pranshugupta54 Mar 23, 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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Count number of lines
run: |
chmod +x ./.github/workflows/countline.py
./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts
./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx

- name: Get changed TypeScript files
id: changed-files
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
. "$(dirname -- "$0")/_/husky.sh"

# npm run format:fix
# npm run lint:fix
npm run lint:fix
npm run lint-staged
npm run typecheck
npm run update:toc
Expand Down
Loading
Loading