Commit graph

39 commits

Author SHA1 Message Date
477e8552d8
Merge pull request #9 from flifloo/kybo
last modifs kybo
2021-12-03 06:41:07 +01:00
b20f896378
Merge pull request #8 from flifloo/flifloo
Merger branch flifloo
2021-12-03 06:40:46 +01:00
fac49716f5 Create README and example sql 2021-12-03 06:40:07 +01:00
1b1943574d Create README 2021-12-03 06:26:54 +01:00
593fd25dc5 People list 2021-12-03 06:20:07 +01:00
b56da36893 Dynamic search 2021-12-03 06:19:58 +01:00
Kybo09
3d73c66332 last modifs kybo 2021-12-03 05:57:06 +01:00
30da722bac Dynamic map 2021-12-03 05:22:13 +01:00
046e52ecd3 Add missing migrations 2021-12-03 04:57:17 +01:00
fe817f4dd7
Merge pull request #7 from flifloo/kybo
Merge branch kybo
2021-12-03 04:56:18 +01:00
5771853cdc Merge branch 'master' into kybo
# Conflicts:
#	templates/base.html
2021-12-03 04:55:50 +01:00
804de77f12
Merge pull request #6 from flifloo/flifloo
Merge branch flifloo
2021-12-03 04:53:35 +01:00
Kybo09
363c37b8a4 adding stuff 2021-12-03 04:53:31 +01:00
6f02c4b050 Add boats 2021-12-03 04:52:09 +01:00
8293b77752 Add ajax search 2021-12-03 04:34:10 +01:00
c56bcc041c Login/logout un header, gravatar 2021-12-03 04:22:10 +01:00
0e0016382c Register model to admin panel 2021-12-03 03:40:41 +01:00
d587904138 Integration of kybo branch 2021-12-03 03:34:02 +01:00
92184d5633
Merge pull request #5 from flifloo/flifloo
Merge branche flifloo
2021-12-03 02:39:36 +01:00
e5016b1bfc Merge branch 'master' into flifloo
# Conflicts:
#	nuitdelinfo_2021/views.py
#	templates/personnes.html
2021-12-03 02:38:53 +01:00
93ad1230ae Integration of kybo branch 2021-12-03 02:37:28 +01:00
Kezel Benoit
40f3b1f00f
Merge pull request #4 from flifloo/kybo
Kybo
2021-12-03 02:19:09 +01:00
Kybo09
aa48208d29 Merge branch 'kybo' of github.com:flifloo/nuitdelinfo_2021 into kybo 2021-12-03 02:15:44 +01:00
Kybo09
fab48e5def adding login / register 2021-12-03 02:14:16 +01:00
833dac43c0 Merge branch 'master' into kybo 2021-12-03 02:00:00 +01:00
0ead6b6396
Merge pull request #2 from flifloo/flifloo
Merge flifloo
2021-12-03 01:49:56 +01:00
8f10a44423 Test GitHub django workflow 2021-12-03 01:46:05 +01:00
a63fb287fd Add docker image and compose 2021-12-03 01:45:44 +01:00
Kybo09
c8f313996d adding personnes page 2021-12-03 01:24:17 +01:00
232b976f2d Protect pages with login 2021-12-03 01:12:12 +01:00
3cd8535ab9 Implement login/register 2021-12-03 01:09:55 +01:00
3220219b16 Setup rescue submission and edit 2021-12-03 00:23:06 +01:00
Kybo09
52d4ef668f adding articles page 2021-12-03 00:06:04 +01:00
d6948e455a Setup people submission and edit 2021-12-02 23:46:42 +01:00
Kybo09
bd61d18009 home page 2021-12-02 22:30:17 +01:00
691afa7298 Apps split and base of error page 2021-12-02 21:57:32 +01:00
b20034a79a
Merge pull request #1 from flifloo/flifloo
Base of template and statics
2021-12-02 19:31:38 +01:00
e3d1a776be Base of template and statics 2021-12-02 19:30:42 +01:00
8a92ec0451 Init commit 2021-12-02 18:13:33 +01:00