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

Merge pull request #14 from ukecode/feature/op05 #15

Open
wants to merge 10 commits into
base: feature/op03
Choose a base branch
from
Open

Merge pull request #14 from ukecode/feature/op05 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30d1ef7
Merge pull request #10 from pyviking/feature/op03
May 9, 2020
4cca6cd
Merge pull request #11 from pyviking/feature/op05
May 10, 2020
185f1bb
Update README.md
May 14, 2020
ba41cb0
Update README.md
May 18, 2020
3852ea1
Update README.md
May 18, 2020
2d6560e
Update README.md
May 18, 2020
a7fa268
Merge pull request #14 from ukecode/feature/op05
May 31, 2020
d614308
Bump django from 3.0.5 to 3.0.7
dependabot[bot] Jun 6, 2020
936d402
Merge pull request #16 from ukecode/dependabot/pip/django-3.0.7
Jun 10, 2020
fbe4add
Merge branch 'develop' into feature/op08
Jun 11, 2020
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
15 changes: 14 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Controlle
# Controlle Finance
## **Aplicação para gerenciar gastos pessoais**

[Acessar aplicação](https://controlle-finance.herokuapp.com/
)

### Controle de gastos
Um sistema completo para controlar contas a pagar e receber, e controlar seus gastos pessoais.

Expand All @@ -11,6 +14,16 @@ Um sistema completo para controlar contas a pagar e receber, e controlar seus ga
- Opção de incluir categorias de despesas/receitas para melhor organização
- Relatório de movimento por período, por categoria


[Acessar site](https://controlle-finance.herokuapp.com)

### Lembrar-se de fazer git pull

### Features e suas atribuições no projeto

|FEATURE | ATRIBUIÇÃO |
|----------------|--------------------------|
| feature/op03 | Banco de dados e modelos |
| feature/op05 | Design da aplicação |
| feature/op08 | Segurança e autenticação |

1 change: 1 addition & 0 deletions requirements-local.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Django==3.0.5
pkg-resources==0.0.0
py-moneyed==0.8.0
django-money
pytz==2019.3
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
asgiref==3.2.7
dj-database-url==0.5.0
Django==3.0.5
Django==3.0.7
django-heroku==0.3.1
django-money==1.1
gunicorn==20.0.4
Expand Down