-
- Downloads
Merge branch 'Develop' into 'Develop_copy_to_implement_acessibility'
# Conflicts: # src/Admin/Components/Components/AdminTemplate.js # src/Admin/Components/Components/DataCards/CommunityQuestionCard.js # src/Admin/Components/Components/Inputs/CreateInstitution.js # src/Admin/Components/Components/Inputs/CreateLanguage.js # src/Admin/Components/Components/Inputs/CreateQuestion.js # src/Admin/Components/Components/Inputs/CreateRating.js # src/Admin/Components/Components/Inputs/CreateRole.js # src/Admin/Components/Components/Inputs/EditCollection.js # src/Admin/Components/Components/Inputs/EditEducationalObect.js # src/Admin/Components/Components/Inputs/EditLanguage.js # src/Admin/Components/Components/Inputs/EditRating.js # src/Admin/Components/Components/Inputs/EditRoles.js # src/Admin/Components/Components/Inputs/IntitutionsInputs.js # src/Admin/Components/Components/Inputs/NoteVarInputs.js # src/Admin/Components/Components/Unauthorized.js # src/App.js # src/Components/ButtonGuardarColecao.js # src/Components/CollectionCardFunction.js # src/Components/CollectionCommentSection.js # src/Components/ContactForm.js # src/Components/Firulas.js # src/Components/FormInput.js # src/Components/Header.js # src/Components/LoadingSpinner.js # src/Components/LoginModal.js # src/Components/ModalAvaliarRecurso.js # src/Components/ModalExcluirColecao.js # src/Components/PageProfessorComponents/PartOne.js # src/Components/ReportModal.js # src/Components/ReportUserForm.js # src/Components/ResourcePageComponents/CommentForm.js # src/Components/ResourcePageComponents/Sobre.js # src/Components/SignUpModal.js # src/Components/SnackbarComponent.js # src/Components/Stepper.js # src/Components/UploadPageComponents/Forms/Keywords.js # src/Components/UploadPageComponents/Stepper.js # src/Components/UploadPageComponents/StyledComponents.js # src/Components/UploadPageComponents/UploadFileWrapper.js # src/Components/carousel.css # src/Pages/ChangePasswordPage.js # src/Pages/EditProfilePage.js # src/Pages/ResourcePage.js # src/Pages/Search.js
No related branches found
No related tags found
Showing
- package-lock.json 6 additions, 6 deletionspackage-lock.json
- package.json 1 addition, 1 deletionpackage.json
- src/Admin/Components/Components/DataCards/ActivityCard.js 1 addition, 0 deletionssrc/Admin/Components/Components/DataCards/ActivityCard.js
- src/Admin/Components/Components/DataCards/CommunityQuestionCard.js 20 additions, 2 deletions.../Components/Components/DataCards/CommunityQuestionCard.js
- src/Admin/Components/Components/DataCards/EducationalObjectsCard.js 1 addition, 0 deletions...Components/Components/DataCards/EducationalObjectsCard.js
- src/Admin/Components/Components/Inputs/CreateInstitution.js 20 additions, 2 deletionssrc/Admin/Components/Components/Inputs/CreateInstitution.js
- src/Admin/Components/Components/Inputs/CreateLanguage.js 19 additions, 0 deletionssrc/Admin/Components/Components/Inputs/CreateLanguage.js
- src/Admin/Components/Components/Inputs/CreateQuestion.js 21 additions, 0 deletionssrc/Admin/Components/Components/Inputs/CreateQuestion.js
- src/Admin/Components/Components/Inputs/CreateRating.js 19 additions, 0 deletionssrc/Admin/Components/Components/Inputs/CreateRating.js
- src/Admin/Components/Components/Inputs/CreateRole.js 20 additions, 0 deletionssrc/Admin/Components/Components/Inputs/CreateRole.js
- src/Admin/Components/Components/Inputs/EditCollection.js 21 additions, 2 deletionssrc/Admin/Components/Components/Inputs/EditCollection.js
- src/Admin/Components/Components/Inputs/EditEducationalObect.js 20 additions, 2 deletions...dmin/Components/Components/Inputs/EditEducationalObect.js
- src/Admin/Components/Components/Inputs/EditLanguage.js 21 additions, 2 deletionssrc/Admin/Components/Components/Inputs/EditLanguage.js
- src/Admin/Components/Components/Inputs/EditRating.js 21 additions, 2 deletionssrc/Admin/Components/Components/Inputs/EditRating.js
- src/Admin/Components/Components/Inputs/EditRoles.js 21 additions, 2 deletionssrc/Admin/Components/Components/Inputs/EditRoles.js
- src/Admin/Components/Components/Inputs/EditUser.js 21 additions, 3 deletionssrc/Admin/Components/Components/Inputs/EditUser.js
- src/Admin/Components/Components/Inputs/IntitutionsInputs.js 21 additions, 1 deletionsrc/Admin/Components/Components/Inputs/IntitutionsInputs.js
- src/Admin/Components/Components/Inputs/NoteVarInputs.js 21 additions, 2 deletionssrc/Admin/Components/Components/Inputs/NoteVarInputs.js
- src/Admin/Components/Components/Unauthorized.js 4 additions, 12 deletionssrc/Admin/Components/Components/Unauthorized.js
- src/App.css 0 additions, 41 deletionssrc/App.css
Loading
Please register or sign in to comment