Commit Graph

57 Commits

Author SHA1 Message Date
Vincent Ramiere
165965a391 Merge branch 'main' into Vincent
Merge main
2022-03-13 19:39:35 +01:00
Vincent Ramiere
5cbd384954 settings gradle 2022-03-13 19:37:45 +01:00
Thomas Cardon
2cb10cfd8c modif sql 2022-03-11 16:28:25 +01:00
Thomas Cardon
d947455bb7 merge resolution(gitignore) 2022-03-11 16:18:36 +01:00
Vincent Ramiere
0ceae0c0bf Merge branch 'dev' into Vincent
Fin Dev
2022-03-11 14:53:40 +01:00
Thomas Cardon
b1e1952da8 Model Role OUT + data.sql a jour 2022-03-11 14:34:22 +01:00
Thomas Cardon
b9ad367ed3 modif preferencePK + preferenceController 2022-03-09 14:03:46 +01:00
Vincent Ramiere
475587d541 Merge branch 'dev' into Vincent
04/03/2022
2022-03-04 15:34:13 +01:00
Vincent Ramiere
2795468f61 modif data.sql 2022-03-04 15:33:13 +01:00
Vincent Ramiere
25551e5163 modif data.sql 2022-03-04 14:35:06 +01:00
Vincent Ramiere
ced6a29d82 modif settings.gradle 2022-03-04 14:30:13 +01:00
Thomas Cardon
1ac61e3ca8 merge ok 2022-03-04 11:23:44 +01:00
Thomas Cardon
1b0c6b29f8 ajout data.sql 2022-03-04 11:20:20 +01:00
Thomas Cardon
0181659847 merge secu 2022-03-02 14:15:54 +01:00
Thomas Cardon
1003f1c7c9 secu + merge resolution 2022-03-02 14:11:50 +01:00
Thomas Cardon
656899ea4c atteindre Preferences dans Personne 2022-03-02 14:05:02 +01:00
Thomas Cardon
820aabcaa1 token = ok 2022-02-28 15:30:49 +01:00
Thomas Cardon
d3b7a9bb88 qq datas en + 2022-02-28 14:11:10 +01:00
Your Name
c8d9cd4db8 secu 2022-02-28 14:10:36 +01:00
Vincent Ramiere
6477f7e4a5 maj dataSql pour personnes et restaus 2022-02-17 09:44:19 +01:00
Vincent Ramiere
d88b34c774 Merge branch 'dev' into Vincent
OK
2022-02-17 09:32:10 +01:00
Thomas Cardon
25da5fbf57 modif data.sql 2022-02-16 17:05:40 +01:00
Thomas
ac43443308
Update .gitignore 2022-02-16 16:46:00 +01:00
Thomas Cardon
c59b5541ce Merge branch 'dev' of https://github.com/thomascardon35/simpleat-back into dev 2022-02-16 16:04:08 +01:00
Thomas Cardon
18e4d8c76c test 2022-02-16 16:03:39 +01:00
Thomas
02d767e40e
Update .gitignore 2022-02-16 15:52:44 +01:00
Thomas Cardon
098c21df05 test 2022-02-16 15:51:22 +01:00
Thomas
1d92a6986a
Update .gitignore 2022-02-16 15:48:00 +01:00
Thomas
971a6482ed
Update .gitignore 2022-02-16 15:42:57 +01:00
Thomas Cardon
194ad9a705 Merge branch 'dev' of https://github.com/thomascardon35/simpleat-back into dev 2022-02-16 15:36:00 +01:00
Thomas Cardon
2e4055c084 test 2022-02-16 15:35:24 +01:00
Thomas
b6fef49427
Update .gitignore 2022-02-16 15:33:53 +01:00
Thomas Cardon
3f3e03b4b1 test gitignore properties 2022-02-16 15:30:00 +01:00
Thomas Cardon
af3a009e4c modif data.sql 2022-02-16 15:26:40 +01:00
Thomas
4899fa8237
Update .gitignore
application.properties
2022-02-16 15:25:10 +01:00
Vincent Ramiere
fc916ca0b6 Modif app.properties_vincent 2022-02-16 15:17:34 +01:00
Thomas Cardon
c3ef5f63b3 fin du merge dev->thomas sans bug 2022-02-15 00:05:55 +01:00
Thomas
49694f4bc0
Update build.gradle 2022-02-15 00:03:51 +01:00
Thomas Cardon
6ae5799eac merge dev 2022-02-14 23:39:35 +01:00
Thomas Cardon
73a352973e acces aux types par restau 2022-02-14 23:28:20 +01:00
Vincent Ramiere
eadca672ba Merge branch 'dev' into Vincent
valid
2022-02-14 17:40:24 +01:00
Thomas Cardon
1f5f94ac63 data.sql et bug Boolean null 2022-02-14 17:30:49 +01:00
Thomas
8f0cbdb758
Update .gitignore
exclusion de application.properties
2022-01-25 16:25:55 +01:00
Thomas Cardon
4dee7c966f CRUD pref resto personne=ok 2022-01-25 16:02:30 +01:00
Thomas Cardon
39c546794c url delete-pref 2022-01-25 11:38:20 +01:00
Thomas Cardon
0b916f16c0 maj typerestau 2022-01-25 11:18:38 +01:00
Thomas Cardon
786d8b23d9 export collec postman 2022-01-21 20:04:05 +01:00
Thomas Cardon
5a64f29586 suppr restau+pref=OK 2022-01-21 18:28:54 +01:00
Vincent Ramiere
44af1869a7 Merge branch 'dev' into Vincent
Merge dev sur vincent
2022-01-21 15:03:21 +01:00
Thomas Cardon
d06c06b595 ajout fichier tx Postman 2022-01-20 16:35:56 +01:00