Commit Graph

130 Commits

Author SHA1 Message Date
Jonas 12t d62e77e71d Merge branch 'main' into nonfree_main 2022-01-14 12:27:28 +04:00
Jonas 12t afe7d74434 Migration : Jauge atteinte, evenement complet 2022-01-14 12:27:14 +04:00
Jonas 12t 743dc7e2dc Jauge atteinte, evenement complet 2022-01-14 12:26:46 +04:00
Jonas 12t 280405d56f Merge branch 'main' into nonfree_main 2022-01-14 11:09:43 +04:00
Jonas 12t e0b07f51f7 maj to django 3.2 migrations 2022-01-14 11:09:26 +04:00
Jonas 12t 5f896eba44 Merge branch 'main' into nonfree_main 2022-01-14 11:08:22 +04:00
Jonas 12t 05cd50f0f1 maj to django 3.2 2022-01-14 11:00:36 +04:00
Jonas 12t e7f5691971 Merge branch 'main' into nonfree_main 2022-01-14 10:02:56 +04:00
Jonas 12t a75544dd1c api place séparé 2022-01-14 10:02:42 +04:00
Jonas 12t 697acad9bc Merge branch 'main' into nonfree_main 2022-01-13 16:39:15 +04:00
Jonas 12t 4f22275f5e place_serialized 2022-01-13 16:39:03 +04:00
Jonas 12t 7fbf0ac80f blk-pro-mvc 2022-01-13 12:31:14 +04:00
Jonas 12t b25251f8b2 Merge branch 'main' into nonfree_main 2022-01-13 12:30:01 +04:00
Jonas 12t b0b077d4c0 blk-pro-mvc 2022-01-13 12:29:51 +04:00
Jonas 12t 6adc6084fa Merge branch 'main' into nonfree_main 2022-01-13 12:23:27 +04:00
Jonas 12t d615a6fbb2 blk-pro-mvc 2022-01-13 12:23:06 +04:00
Jonas 12t f13a492643 Merge branch 'main' into nonfree_main 2022-01-13 12:10:40 +04:00
Jonas 12t 8f93a549c1 serializer erreur if no stripe api key 2022-01-13 12:10:28 +04:00
Jonas 12t fbcd3c2562 Merge branch 'main' into nonfree_main
# Conflicts:
#	Docker/Development/docker-compose.yml
#	Docker/Dockerfile_Node/dockerfile
#	Docker/compose/docker-compose-base.yml
2022-01-13 11:53:31 +04:00
Jonas 12t 88d471ac87 user créé dans reservation si n'existe pas. 2022-01-13 11:52:01 +04:00
Jonas 12t e645704084 list des reservation pour admin
création des reservation pour tout le monde
2022-01-13 10:57:17 +04:00
Jonas Legion 219363acbb choices templates 2021-12-22 10:45:51 +04:00
Jonas Legion 4d04ec864e migration 2021-12-21 17:24:16 +04:00
Jonas Legion 0ca884f6c1 Vue app 2021-12-21 16:09:44 +04:00
Jonas Legion 5f1ab83828 blk non free 2021-12-20 10:31:31 +04:00
Jonas Legion 2a86a26dda merge 2021-12-20 10:21:20 +04:00
Jonas Legion d9d4015140 Merge branch 'main' into main_nonfree
# Conflicts:
#	Docker/Development/docker-compose.yml
2021-12-20 09:42:05 +04:00
Moi Windows VSC ed49281afc Installation pour windowset vsc 2021-12-18 05:45:29 +01:00
Jonas Legion d7c76c2c81 pre log4s for dev' 2021-12-18 09:04:03 +04:00
Jonas Legion 6bdedda993 compose 2021-12-10 15:36:01 +04:00
Jonas Legion df21c3f664 email input 2021-12-08 17:43:11 +04:00
Jonas Legion df1907d65c title trop long 2021-12-08 16:45:31 +04:00
Jonas Legion dfcf6abad5 calendrier 2021-12-08 16:40:17 +04:00
Jonas Legion a07e4428c5 menu target no blank 2021-12-08 15:03:30 +04:00
Jonas Legion c1197bf764 menu & titres 2021-12-08 14:35:39 +04:00
Jonas Legion 5e436a7f67 Merge branch 'main' into BLK_nonfree
# Conflicts:
#	Docker/Production/docker-compose.yml
2021-12-08 12:24:23 +04:00
achabran 64d9e63463
Add files via upload
Tablette TiBillet
2021-12-08 11:10:48 +04:00
Jonas Legion b9ccfa5138 link menu 2021-12-08 09:25:33 +04:00
Jonas Legion 5b8b699994 Blk non free 2021-12-07 23:56:43 +04:00
Jonas Legion d53d8481c2 Merge branch 'main' into BLK_nonfree 2021-12-07 13:05:48 +04:00
Jonas Legion 31497040c6 rename lieu 2021-12-07 13:05:10 +04:00
Jonas Legion 2fa5c45126 add original file BLK PRO 2021-12-07 12:59:19 +04:00
Axel Chabran ddfcbfadbf modif contenu landing page 2021-12-07 10:18:58 +04:00
Axel Chabran 3380ab6b6f first commit 2021-12-07 09:51:35 +04:00
Jonas Legion a5fdda5d8b test nonfree 2021-12-06 18:37:11 +04:00
Jonas Legion 50c506e8e5 test nonfree 2021-12-06 18:36:14 +04:00
Jonas Legion 949fd3ddb2 Image du produit translate 2021-12-06 18:34:40 +04:00
Jonas Legion 499daa30e2 Choose your template power ! 2021-12-06 18:31:55 +04:00
Jonas Legion 7ae07441ba BeStrong 2021-12-06 16:43:04 +04:00
Jonas Legion 4ecbd8e701 blk MIT Licence 2021-12-06 15:39:23 +04:00