Skip to content

Mergin from Terb #2

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

Open
Tomdieu wants to merge 56 commits into
base: main
Choose a base branch
from
Open

Mergin from Terb #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
ebe289f
Merge pull request #10 from BrownofDarkness/main
Tomdieu Dec 19, 2022
145015b
Merge pull request #9 from Ronanterb/main
BrownofDarkness Dec 20, 2022
28aca1d
front
BrownofDarkness Dec 20, 2022
379e749
front1
BrownofDarkness Dec 20, 2022
edc028e
modeification apiviews and start testing
BrownofDarkness Dec 22, 2022
4b51c6f
modeification apiviews and start testing resolv small bug
BrownofDarkness Dec 22, 2022
76d7fc1
Merge pull request #11 from BrownofDarkness/main
Tomdieu Dec 23, 2022
8669937
cors prob
Ronanterb Dec 24, 2022
e6d4506
remove django_filters
BrownofDarkness Dec 24, 2022
dd4297c
adding django_cors
BrownofDarkness Dec 24, 2022
f7c8f7b
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
Ronanterb Dec 24, 2022
2a6d15e
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
Ronanterb Dec 24, 2022
e1ca17c
updating django_cors
BrownofDarkness Dec 24, 2022
f336bd1
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
BrownofDarkness Dec 24, 2022
63f3dae
simple script login
Ronanterb Dec 24, 2022
56b05eb
Delete node_modules directory
Tomdieu Dec 25, 2022
51cfdca
Merge pull request #12 from BrownofDarkness/main
Tomdieu Dec 25, 2022
011c87e
Merge pull request #10 from Tomdieu/main
Tomdieu Dec 25, 2022
0eab4fb
Login succesfull
Ronanterb Dec 26, 2022
ec1c47e
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
Ronanterb Dec 26, 2022
19953db
permission allowany on profiles
BrownofDarkness Dec 26, 2022
47a3820
updated: error message
Tomdieu Dec 26, 2022
2153da9
updated: added env
Tomdieu Dec 26, 2022
dbf0e74
updated: imported ugettext_lazy
Tomdieu Dec 26, 2022
34be958
updated
Tomdieu Dec 26, 2022
8802a6c
red only on pin and delated_at
BrownofDarkness Dec 26, 2022
7e24ba5
updatex: fix problem of making the transaction between two identical …
Tomdieu Dec 26, 2022
29b6eda
updated: db
Tomdieu Dec 26, 2022
176719b
updated
Tomdieu Dec 26, 2022
1938752
updated
Tomdieu Dec 26, 2022
029a66d
Delete package-lock.json
Tomdieu Dec 26, 2022
2fc531a
Delete package.json
Tomdieu Dec 26, 2022
6b83a5a
Update api_views.py
Tomdieu Dec 26, 2022
3a0deaa
Merge pull request #14 from Tomdieu/Tomdieu-main
Tomdieu Dec 26, 2022
66a2973
resolution du problème de hachage du password
BrownofDarkness Dec 26, 2022
eb9d68a
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
BrownofDarkness Dec 26, 2022
529b3bd
register
Ronanterb Dec 26, 2022
fa72e2f
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
Ronanterb Dec 26, 2022
16439e5
login and registration done
Ronanterb Dec 28, 2022
56fdf68
starting account fetch, before phone fail
Ronanterb Dec 29, 2022
bec1d0d
transactions start
Ronanterb Dec 31, 2022
8e34a57
password and transactions issue
Ronanterb Jan 1, 2023
1a7a08f
pass, trans, update pack
Ronanterb Jan 1, 2023
d03463b
rendering transcations
Ronanterb Jan 2, 2023
5897243
Update tests.py
Tomdieu Jan 2, 2023
dd863c9
before final state refresh
Ronanterb Jan 3, 2023
00c42f5
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
Ronanterb Jan 3, 2023
e98c7a2
Update requirements.txt
Tomdieu Jan 4, 2023
ffe98b6
Create pytest.ini
Tomdieu Jan 4, 2023
bf08738
complete app needing minor code addition
Ronanterb Jan 4, 2023
026563a
Merge branch 'main' of https://github.com/BrownofDarkness/TransferGo
Ronanterb Jan 4, 2023
c1a3e77
Merge pull request #1 from BrownofDarkness/main
ivantom-pro Jan 4, 2023
d3afdde
Merge pull request #17 from ivantom-pro/main
BrownofDarkness Jan 5, 2023
3f44e6c
md dbsqite
BrownofDarkness Jan 5, 2023
22aac1e
add db in git ignore
BrownofDarkness Jan 5, 2023
2c663ed
just reformating of testing file
BrownofDarkness Jan 5, 2023
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
12 changes: 12 additions & 0 deletions .idea/TransferGo.iml
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

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

36 changes: 22 additions & 14 deletions .idea/workspace.xml
View file
Open in desktop

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

23 changes: 0 additions & 23 deletions node_modules/.package-lock.json
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions node_modules/git/.npmignore
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions node_modules/git/.travis.yml
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions node_modules/git/README.md
View file
Open in desktop

This file was deleted.

150 changes: 0 additions & 150 deletions node_modules/git/benchmarks/benchmark.js
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions node_modules/git/lib/diff/block.js
View file
Open in desktop

This file was deleted.

Loading