Skip to content

Commit

Permalink
Merge branch 'PalisadoesFoundation:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
SiddheshKukade authored Nov 17, 2023
2 parents e32b45b + 4e9265c commit e1566b6
Show file tree
Hide file tree
Showing 102 changed files with 6,809 additions and 2,458 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Adding Issue Label
runs-on: ubuntu-latest
steps:
- uses: Renato66/auto-label@v2.2.0
- uses: Renato66/auto-label@v2.3.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ignore-comments: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
uses: VeryGoodOpenSource/very_good_coverage@v2
with:
path: "./coverage/lcov.info"
min_coverage: 91.0
min_coverage: 95.0
Graphql-Inspector:
name: Runs Introspection on the github talawa-api repo on the schema.graphql file
runs-on: ubuntu-latest
Expand All @@ -79,4 +79,4 @@ jobs:
run: git clone https://github.com/PalisadoesFoundation/talawa-api && ls -a

- name: Validate Documents
run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'
run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/stale@v7
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please check if the develop branch has fixed it and report again or close the issue.'
Expand Down
20 changes: 20 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"react-dom": "^17.0.2",
"react-google-recaptcha": "^2.1.0",
"react-i18next": "^11.18.1",
"react-infinite-scroll-component": "^6.1.0",
"react-redux": "^7.2.5",
"react-router-dom": "^5.2.0",
"react-scripts": "5.0.1",
Expand Down
62 changes: 53 additions & 9 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@
"login_to_admin_portal": "Admin Portal Login",
"OR": "OR"
},
"latestEvents": {
"eventCardTitle": "Upcoming Events",
"eventCardSeeAll": "See All",
"noEvents": "No Upcoming Events"
},
"latestPosts": {
"latestPostsTitle": "Latest Posts",
"seeAllLink": "See All",
"noPostsCreated": "No Posts Created"
},
"listNavbar": {
"talawa_portal": "Talawa Admin Portal",
"roles": "Roles",
Expand Down Expand Up @@ -76,6 +86,7 @@
"searchByName": "Search By Name",
"organizations": "Organizations",
"createOrganization": "Create Organization",
"createSampleOrganization": "Create Sample Organization",
"description": "Description",
"location": "Location",
"isPublic": "Is Public",
Expand All @@ -86,18 +97,22 @@
"filter": "Filter",
"cancel": "Cancel",
"noOrgErrorTitle": "Organizations Not Found",
"sampleOrgDuplicate": "Only one sample organization allowed",
"noOrgErrorDescription": "Please create an organization through dashboard",

"endOfResults": "End of results",
"manageFeatures": "Manage Features",
"manageFeaturesInfo": "Creation Successful ! Please select features that you want to enale for this organization from the plugin store.",
"goToStore": "Go to Plugin Store",
"enableEverything": "Enable Everything",
"noResultsFoundFor": "No results found for "
"noResultsFoundFor": "No results found for",
"OR": "OR",
"sampleOrgSuccess": "Sample Organization Successfully Created"
},
"orgListCard": {
"admins": "Admins",
"members": "Members",
"manage": "Manage"
"manage": "Manage",
"sampleOrganization": "Sample Organization"
},
"paginationList": {
"rowsPerPage": "rows per page",
Expand All @@ -110,6 +125,15 @@
"name": "Name",
"email": "Email",
"roles_userType": "Role/User-Type",
"joined_organizations": "Joined Organizations",
"blocked_organizations": "Blocked Organizations",
"orgJoinedBy": "Organizations Joined By",
"orgThatBlocked": "Organizations That Blocked",
"endOfResults": "End of results",
"hasNotJoinedAnyOrg": "has not joined any organization",
"isNotBlockedByAnyOrg": "is not blocked by any organization",
"searchByOrgName": "Search By Organization Name",
"view": "View",
"admin": "ADMIN",
"superAdmin": "SUPERADMIN",
"user": "USER",
Expand All @@ -132,6 +156,7 @@
"accept": "Accept",
"reject": "Reject",
"enterName": "Enter Name",
"endOfResults": "End of results",
"loadingRequests": "Loading Requests...",
"noRequestFound": "No Request Found",
"sort": "Sort",
Expand All @@ -154,6 +179,13 @@
"events": "Events",
"blockedUsers": "Blocked Users",
"requests": "Requests",
"viewAll": "View All",
"upcomingEvents": "Upcoming Events",
"noUpcomingEvents": "No Upcoming Events",
"latestPosts": "Latest Posts",
"noPostsPresent": "No Posts Present",
"membershipRequests": "Membership requests",
"noMembershipRequests": "No Membership requests present",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"organizationPeople": {
Expand Down Expand Up @@ -252,17 +284,25 @@
"posts": "Posts",
"createPost": "Create Post",
"postDetails": "Post Details",
"postTitle1": "Write title of the post",
"postTitle": "Title",
"information": "Information",
"information1": "Write information of the post",
"image": "Post Image",
"video": "Video",
"video": "Post Video",
"addPost": "Add Post",
"searchTitle": "Search By Title",
"searchText": "Search By Text",
"ptitle": "Post Title",
"postDes": "What do you to talk about?",
"Title": "Title",
"Text": "Text"
"Text": "Text",
"cancel": "Cancel",
"searchBy": "Search By",
"Oldest": "Oldest First",
"Latest": "Latest First",
"sortPost": "Sort Post",
"tag": " Your browser does not support the video tag"
},
"postNotFound": {
"post": "Post",
Expand All @@ -284,6 +324,7 @@
"author": "Author",
"imageURL": "Image URL",
"videoURL": "Video URL",
"edit": "Edit Post",
"deletePost": "Delete Post",
"deletePostMsg": "Do you want to remove this post?",
"no": "No",
Expand All @@ -297,6 +338,8 @@
"updatePost": "Update Post",
"postDeleted": "Post deleted successfully.",
"postUpdated": "Post Updated successfully.",
"tag": " Your browser does not support the video tag",
"pin": "Pin Post",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"blockUnblockUser": {
Expand Down Expand Up @@ -329,7 +372,7 @@
"enterNewPassword": "Enter New Password",
"cofirmNewPassword": "Confirm New Password",
"changePassword": "Change Password",
"backToHome": "Back to Home",
"backToLogin": "Back to Login",
"userOtp": "e.g. 12345",
"password": "Password",
"emailNotRegistered": "Email is not registered.",
Expand Down Expand Up @@ -377,10 +420,11 @@
},
"deleteOrg": {
"deleteOrganization": "Delete Organization",
"deleteSampleOrganization": "Delete Sample Organization",
"deleteMsg": "Do you want to delete this organization?",
"no": "No",
"yes": "Yes",
"longDelOrgMsg": "By clicking on Delete organization button you will the organization will be permanently deleted along with its events, tags and all related data."
"cancel": "Cancel",
"confirmDelete": "Confirm Delete",
"longDelOrgMsg": "By clicking on Delete Organization button the organization will be permanently deleted along with its events, tags and all related data."
},
"userUpdate": {
"firstName": "First Name",
Expand Down
Loading

0 comments on commit e1566b6

Please sign in to comment.