Thomas Rubini
|
62c6274043
|
Merge pull request #155 from ThomasRubini/instructions
|
2023-01-26 22:35:17 +01:00 |
|
Thomas Rubini
|
d6cf92b7da
|
rename 'recipe' to 'instructions'
|
2023-01-26 22:34:13 +01:00 |
|
Thomas Rubini
|
6bac400a23
|
Merge pull request #154 from ThomasRubini/recipe_update_delete
|
2023-01-26 21:45:24 +01:00 |
|
Thomas Rubini
|
0fd3e0aa15
|
delete ingredients not in update request
|
2023-01-26 21:45:02 +01:00 |
|
Thomas Rubini
|
553776774f
|
do not delete from table INGREDIENT
|
2023-01-26 21:45:02 +01:00 |
|
Thomas Rubini
|
e68c31becb
|
Merge pull request #153 from ThomasRubini/recipe_insert
|
2023-01-26 21:44:54 +01:00 |
|
Thomas Rubini
|
2a54dd3192
|
add comments
|
2023-01-26 21:35:54 +01:00 |
|
Thomas Rubini
|
1e75a5df58
|
allow to set recipe img when inserting
|
2023-01-26 21:34:28 +01:00 |
|
Thomas Rubini
|
96c77453e2
|
Merge pull request #152 from ThomasRubini/inter_user_null
|
2023-01-26 21:29:04 +01:00 |
|
Thomas Rubini
|
4fdb49454f
|
fix typo
|
2023-01-26 21:28:57 +01:00 |
|
Thomas Rubini
|
9014ca45f3
|
handle case where user is null in interactions
|
2023-01-26 21:27:55 +01:00 |
|
Marla
|
13c2377955
|
Merge pull request #151 from ThomasRubini/back_button_edit_recipe
added style for return button in edit recipe page
|
2023-01-26 21:23:31 +01:00 |
|
Marla
|
d2e0cb8aa0
|
Merge pull request #150 from ThomasRubini/gestion_user_width
fixed width in user gestion
|
2023-01-26 21:23:13 +01:00 |
|
Capelier-Marla
|
3de832fb03
|
added style for return button in edit recipe page
|
2023-01-26 21:22:56 +01:00 |
|
Thomas Rubini
|
5e80f58f40
|
Merge pull request #149 from ThomasRubini/recipe_buttons
|
2023-01-26 21:22:11 +01:00 |
|
Thomas Rubini
|
11791c19df
|
only show edit/delete buttons if the user can use them
|
2023-01-26 21:21:56 +01:00 |
|
Thomas Rubini
|
1620746d9e
|
Merge pull request #148 from ThomasRubini/recipe_time
|
2023-01-26 21:17:55 +01:00 |
|
Capelier-Marla
|
fc7538550e
|
fixed width in user gestion
|
2023-01-26 21:17:41 +01:00 |
|
Thomas Rubini
|
ec6610a5ba
|
show recipe time in minutes
|
2023-01-26 21:17:31 +01:00 |
|
Thomas Rubini
|
3a23ef1d27
|
Merge pull request #147 from ThomasRubini/recipe_search
|
2023-01-26 21:15:31 +01:00 |
|
Thomas Rubini
|
72fc35438c
|
use LIKE instead of INSTR in recipe search
|
2023-01-26 21:15:06 +01:00 |
|
Marla
|
9365d034d6
|
Merge pull request #141 from ThomasRubini/header-improvements
Header improvements
|
2023-01-26 21:14:30 +01:00 |
|
|
|
5845108eb1
|
Merge pull request #146 from ThomasRubini/verboser_userManagement
verbose usermanagement
|
2023-01-26 21:12:33 +01:00 |
|
|
|
c0193ca759
|
verbose usermanagement
|
2023-01-26 21:11:50 +01:00 |
|
Thomas Rubini
|
916cb5fcb5
|
Merge pull request #145 from ThomasRubini/recipe_img
|
2023-01-26 20:54:12 +01:00 |
|
Thomas Rubini
|
44f8c0e499
|
add ability to update recipe image
|
2023-01-26 20:53:32 +01:00 |
|
Thomas Rubini
|
73680ecb38
|
Merge pull request #144 from ThomasRubini/user_update
|
2023-01-26 20:48:51 +01:00 |
|
Thomas Rubini
|
7690615b82
|
move image processing to a separate function
|
2023-01-26 20:42:45 +01:00 |
|
Thomas Rubini
|
84ebcd13a4
|
fix typo on image type verification
|
2023-01-26 20:21:29 +01:00 |
|
Thomas Rubini
|
3fd908580e
|
handle errors on user update
|
2023-01-26 20:21:29 +01:00 |
|
Thomas Rubini
|
6c571f3a62
|
Merge pull request #143 from ThomasRubini/user_time
|
2023-01-26 20:10:29 +01:00 |
|
Thomas Rubini
|
2f4128beeb
|
deal with dates correctly
|
2023-01-26 20:10:11 +01:00 |
|
Thomas Rubini
|
e04b43f0ad
|
use UserModel::createFull() instead of constructor
|
2023-01-26 20:10:04 +01:00 |
|
Thomas Rubini
|
68bf0a4c85
|
Merge pull request #142 from ThomasRubini/anon_user_2
|
2023-01-26 19:58:14 +01:00 |
|
Thomas Rubini
|
04d3fdb206
|
use Anon user in Recipe
|
2023-01-26 19:57:55 +01:00 |
|
AudricV
|
d90896dfef
|
Change title and link favicons and add meta elements
- Add some keywords and a description
- Change charset declaration
Co-authored-by: Nicolas <nicolas.laurent@etu.univ-amu.fr>
|
2023-01-26 19:52:02 +01:00 |
|
AudricV
|
068ade5b70
|
Add favicons
|
2023-01-26 19:51:56 +01:00 |
|
Thomas Rubini
|
a36fb5dde2
|
Merge pull request #140 from ThomasRubini/anon_user
|
2023-01-26 19:50:32 +01:00 |
|
Thomas Rubini
|
1e80101833
|
add Anon user object
|
2023-01-26 19:50:03 +01:00 |
|
Thomas Rubini
|
cf7d337c9d
|
fix function name
|
2023-01-26 19:50:03 +01:00 |
|
|
|
cf5f1b68df
|
Merge pull request #139 from ThomasRubini/category_refactor
fixed scrolling category page
|
2023-01-26 19:36:18 +01:00 |
|
|
|
74226c53b6
|
fixed scrolling category page
|
2023-01-26 19:30:31 +01:00 |
|
Marla
|
dc37e31dce
|
Merge pull request #138 from ThomasRubini/fix_manageUser
Fix manage user
|
2023-01-26 19:24:39 +01:00 |
|
Capelier-Marla
|
c13e8e4808
|
styled results
|
2023-01-26 19:24:12 +01:00 |
|
Capelier-Marla
|
5fa1459022
|
edited html to be usable in css
|
2023-01-26 19:24:12 +01:00 |
|
Capelier-Marla
|
0c26986587
|
styled search part
|
2023-01-26 19:24:12 +01:00 |
|
Thomas Rubini
|
1855231de3
|
Merge pull request #137 from ThomasRubini/recipe_contr_login
|
2023-01-26 19:23:39 +01:00 |
|
Thomas Rubini
|
dea9dcb80f
|
do not query user id if not login
|
2023-01-26 19:23:20 +01:00 |
|
Thomas Rubini
|
7e63369481
|
Merge pull request #136 from ThomasRubini/recipe_ingredients
|
2023-01-26 19:21:03 +01:00 |
|
Thomas Rubini
|
25bd38ece7
|
update recipe ingredients
|
2023-01-26 19:20:33 +01:00 |
|
