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

Jump to bottom

Atualizando dev para a main #134

Merged
merged 50 commits into from
Oct 2, 2023
Merged

Atualizando dev para a main #134

merged 50 commits into from
Oct 2, 2023

Conversation

pedrobarbosaocb
Copy link
Collaborator

No description provided.

raqueleucaria and others added 30 commits August 14, 2023 18:58
@pedrobarbosaocb
add teste-template
c4fdda9 
Adicionando testes de código, manipulando um excel template da FINATEC

Co-Authored-By: Pedro Barbosa <[email protected]>
@pedrobarbosaocb
fix: agora o arquivo eh escrito somente uma vez com todos os itens
dc6fe86
@pedrobarbosaocb
refact: limpando ambiente de desenvolvimento
fba4d38
@pedrobarbosaocb
refact: reorganizando paginacao
c282f52
@pedrobarbosaocb
build: criando estrutura inicial do app em django
7ea3a5d
@pedrobarbosaocb
refact: renomeando pasta
76ed817
@pedrobarbosaocb
refact: alterando nome pasta
128ca81
@pedrobarbosaocb
build criando homepage
0d6dd9d
@hemanoelbritoF
Merge pull request #59 from ResidenciaTICBrisa/estruturando-dev
a859e33 
Estruturando dev
@IsaacLusca
Autenticação simples, cadastro e login sem estilo
36f9d4f
@IsaacLusca
Estilo de acordo com o prototipo
f10fd41
@pedrobarbosaocb
Merge branch 'organizando-pastas' into dev
e06771e
@hemanoelbritoF
codigo inicial(mockado)fub
57fb144
@pedrobarbosaocb
Merge pull request #77 from ResidenciaTICBrisa/fub_inicial
1e4f8c5 
Alteração do código inicial da fub
@IsaacLusca
Tela de projetos
4476e4c
@IsaacLusca
redirecionmento cadastro/login, login/projeto
16a3a85
@IsaacLusca
Botão de sair funcional sem estilizar
1a2e11d
@cansancaojennifer
teste
d9e4539
@cansancaojennifer
Merge branch 'dev' of https://github.com/ResidenciaTICBrisa/05_Pipeli…
95285ce 
…neFinatec into dev
@IsaacLusca
Estilo aplicado no botão 'Sair'
3b5085a
@cansancaojennifer
Merge branch 'dev' of https://github.com/ResidenciaTICBrisa/05_Pipeli…
8996e86 
…neFinatec into dev
@cansancaojennifer
mensagem de erro
e679594
@cansancaojennifer
Mensagens de erro
28e436d
@IsaacLusca
db.sqlite
94a77a6
@IsaacLusca
Merge branch 'dev' of https://github.com/ResidenciaTICBrisa/05_Pipeli…
ec20943 
…neFinatec into dev
@IsaacLusca
mensagens de erro de senha padrão django
0b08cbb
@IsaacLusca
estilizando as mensagens de erro da senha
e39e200
@pedrobarbosaocb
build: adicionando conexao com o banco
5dc2ca7
@pedrobarbosaocb
fix: adicionando segundo servidor
db58d1d
@hemanoelbritoF
arrumando a base
b1c22ea
hemanoelbritoF and others added 20 commits August 30, 2023 13:55
@hemanoelbritoF
testes bases todas paginas
8c212f5
@hemanoelbritoF
base final
3a7f0be
@IsaacLusca
db
9968efb
@IsaacLusca
Merge branch 'dev' of https://github.com/ResidenciaTICBrisa/05_Pipeli…
1507355 
…neFinatec into dev
@IsaacLusca
atualização dos arquivos
69583ac
@hemanoelbritoF
Merge pull request #126 from ResidenciaTICBrisa/postgre-installation
d518dd2 
Adicionando conexão do postgre ao Django
@pedrobarbosaocb
build: adicionando o modelo da Fundep
2fbf0f5
@IsaacLusca
adiiconando o campo email
17745b2
@pedrobarbosaocb
fix: organizando templates em um biblioteca
75062a7
@pedrobarbosaocb
build: adicionando modelo opas
c5b8e62
@pedrobarbosaocb
Delete src/codigo-inicial/FUNDEP-inicial.xlsx
9ef8af4
@pedrobarbosaocb
build: modelo ibict paginas
3784786
@pedrobarbosaocb
add: adiionando variaveis de acordo com o bd
799159f
@pedrobarbosaocb
build: adicionando funcao de consulta
dec4578
@raqueleucaria
Merge pull request #127 from ResidenciaTICBrisa/organizando-modelos
3bd756a 
Adicionando script de consulta e biblioteca de modelos
@pedrobarbosaocb
Merge branch 'main' into dev
204b899
@pedrobarbosaocb
Create requirements.txt
95b8009
@pedrobarbosaocb
fix: restaurando arquivos
ec65539
@pedrobarbosaocb
Merge pull request #132 from ResidenciaTICBrisa/corrigindo-dev
0c3a213 
Restaurando arquivos para a dev
@pedrobarbosaocb
Update mkdocs.yml
f297fda
@pedrobarbosaocb pedrobarbosaocb added the aperfeiçoamento Nova feature ou pull request label Oct 1, 2023
@pedrobarbosaocb pedrobarbosaocb self-assigned this Oct 1, 2023
@pedrobarbosaocb pedrobarbosaocb requested review from hemanoelbritoF and removed request for raqueleucaria October 1, 2023 22:52
hemanoelbritoF
hemanoelbritoF approved these changes Oct 2, 2023
View reviewed changes
Copy link
Collaborator

@hemanoelbritoF hemanoelbritoF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@hemanoelbritoF hemanoelbritoF merged commit 462d427 into main Oct 2, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hemanoelbritoF hemanoelbritoF hemanoelbritoF approved these changes

Assignees

@pedrobarbosaocb pedrobarbosaocb

Labels
aperfeiçoamento Nova feature ou pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@pedrobarbosaocb @hemanoelbritoF @IsaacLusca @cansancaojennifer @raqueleucaria