Skip to content

Feature/organization#370

Open
KazizovMedet wants to merge 49 commits intodevelopfrom
feature/organization
Open

Feature/organization#370
KazizovMedet wants to merge 49 commits intodevelopfrom
feature/organization

Conversation

@KazizovMedet
Copy link
Copy Markdown
Contributor

No description provided.

medetkazizov and others added 30 commits June 24, 2024 14:08
…nd connected backend to get edit and create organization
…nd connected backend to get edit and create organization
# Conflicts:
#	src/components/AuditorSearchModal.jsx
…ange owner. now active 404 for organization
# Conflicts:
#	src/components/AuditorModal.jsx
#	src/components/User-info.jsx
#	src/components/audit-request-info.jsx
#	src/pages/audit-info.jsx
#	src/redux/actions/userAction.js
#	src/redux/reducers/auditReducer.js
#	src/routes/AppRoutes.jsx
…re/organization

# Conflicts:
#	src/pages/MyOrganizations.jsx
# Conflicts:
#	src/redux/actions/userAction.js
medetkazizov added 19 commits November 4, 2024 14:48
# Conflicts:
#	src/components/Audit-card.jsx
#	src/components/AuditorSearchModal.jsx
#	src/components/Chat/Message.jsx
#	src/components/IdentitySetting/IdentitySetting.jsx
#	src/components/audit-request-info.jsx
#	src/components/forms/Avatar-form/index.jsx
#	src/pages/AuditorsPage.jsx
#	src/pages/audit-info.jsx
#	src/redux/actions/chatActions.js
#	src/redux/actions/types.js
#	src/redux/middleware/websocketMiddleware.js
#	src/redux/reducers/auditReducer.js
#	src/redux/reducers/auditorReducer.js
#	src/redux/reducers/chatReducer.js
#	src/routes/AppRoutes.jsx
…d view of modal for role, fixes of alert for create request
# Conflicts:
#	src/components/AuditorModal.jsx
#	src/components/AuditorSearchModal.jsx
#	src/components/Chat/CurrentChat.jsx
#	src/components/Chat/Message.jsx
#	src/components/User-info.jsx
#	src/components/audit-request-info.jsx
#	src/components/custom/info-card.jsx
#	src/components/forms/change-link-id/index.jsx
#	src/components/modal/OfferModal.jsx
#	src/pages/ChatPage.jsx
#	src/redux/actions/types.js
#	src/redux/actions/userAction.js
#	src/redux/reducers/auditReducer.js
…tar organization and added logic for request from customer to auditor organization
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants