Maxime BATISTA
|
a28c47c21b
|
merge master and resolve conflicts
|
2 years ago |
|
Maxime BATISTA
|
83788b942d
|
fix compilation errors
|
2 years ago |
|
Maxime BATISTA
|
d556920e4f
|
add base model classes
|
2 years ago |
|
Maxime BATISTA
|
f332b5a0e4
|
Merge branch 'master' of https://codefirst.iut.uca.fr/git/ShopNCook/ShopNCook
|
2 years ago |
|
Maxime BATISTA
|
8019d57fd0
|
add base classes
|
2 years ago |
|
Maxime BATISTA
|
2e487165c9
|
add base model classes
|
2 years ago |
 Leo TUAILLON
|
c1d507bf05
|
Merge pull request 'xaml/confirmMail' (#33) from xaml/confirmMail into master
Reviewed-on: ShopNCook/ShopNCook#33
|
2 years ago |
|
Leo TUAILLON
|
b357890b43
|
fix conflicts
|
2 years ago |
|
Leo TUAILLON
|
7fc67198cf
|
Merge pull request 'xaml/forgotPassword' (#32) from xaml/forgotPassword into master
Reviewed-on: ShopNCook/ShopNCook#32
|
2 years ago |
|
Leo TUAILLON
|
8fd2b496c9
|
fix conflicts
|
2 years ago |
|
Leo TUAILLON
|
b60b0f75b5
|
Merge pull request 'xaml/changePassword' (#30) from xaml/changePassword into master
Reviewed-on: ShopNCook/ShopNCook#30
|
2 years ago |
|
Leo TUAILLON
|
e89ab52ee3
|
fixes
|
2 years ago |
|
Leo TUAILLON
|
89b6584ebe
|
ajout placeolder
|
2 years ago |
|
Leo TUAILLON
|
be803872c8
|
Merge pull request 'xaml/homePage' (#29) from xaml/homePage into master
Reviewed-on: ShopNCook/ShopNCook#29
|
2 years ago |
|
Maxime BATISTA
|
026139a6c8
|
fix conflicts
|
2 years ago |
|
Maxime BATISTA
|
b9f79c69f6
|
fix home
|
2 years ago |
 Maxime BATISTA
|
85a80d2cb3
|
Merge pull request 'xaml/my-recipes' (#31) from xaml/my-recipes into master
Reviewed-on: ShopNCook/ShopNCook#31
|
2 years ago |
|
Leo TUAILLON
|
de13ed2a3e
|
v1 Confirm email view
|
2 years ago |
|
Leo TUAILLON
|
99ad30828c
|
debug
|
2 years ago |
|
Leo TUAILLON
|
d5d3cc9d79
|
ajout item
|
2 years ago |
|
Leo TUAILLON
|
7db84ad932
|
ajout des entry de confirmation du mail + un appicon
|
2 years ago |
|
Leo TUAILLON
|
0506f4b715
|
ForgotPassword (mise à jour) + ajout de grid 1 et 2 / 4
|
2 years ago |
|
Leo TUAILLON
|
0d9febcc04
|
ajout des staticRessource (reste à débugué les margins)
|
2 years ago |
|
Leo TUAILLON
|
3c7f6eec45
|
ajout verticalStackLayout
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
7ebc03cac9
|
add StoredRecipeViews in MyList
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
58773d678e
|
add CounterView and fix RecipesPage
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
c8c58f29b7
|
some fixes and add add recipe button
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
96c33ccb30
|
add weekly list
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
f1dcd519e2
|
end MyRecipes page
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
3a4255cf31
|
merge with master
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
c1f8967407
|
merge with master
|
2 years ago |
|
Maxime BATISTA
|
a6c7ab1ce9
|
Merge pull request 'xaml/more' (#28) from xaml/more into master
Reviewed-on: ShopNCook/ShopNCook#28
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
514b9395e2
|
merge with master
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
7d840a486d
|
add MyRecipes page
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
382bb13650
|
fix all headers to be centered
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
c8dbf858ba
|
merge from master
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
9b0e8d2659
|
merge from master
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
ecd7204d8d
|
merge master
|
2 years ago |
|
Maxime BATISTA
|
d3b0799ca3
|
Merge pull request 'xaml/favorites' (#27) from xaml/favorites into master
Reviewed-on: ShopNCook/ShopNCook#27
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
b55d6055db
|
merge master
|
2 years ago |
|
Leo TUAILLON
|
675722acef
|
ChangePassword page : ajout icon et entry
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
b48926f280
|
dynamise MorePage
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
9bac4e84fc
|
add headed button and add buttons in the more page
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
7d614311cd
|
move pages to a dedicated Pages folder and keep other view components in the Views folder
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
255714ee74
|
add more page
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
102a416706
|
fix idents in search page
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
4050dbcb3e
|
fix recipe view
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
9c0cbc874a
|
add favorite pages
|
2 years ago |
|
Maxime BATISTA
|
9e08a5ee04
|
Merge pull request 'add register page' (#25) from xaml/register into master
Reviewed-on: ShopNCook/ShopNCook#25
|
2 years ago |
|
maxime.BATISTA@etu.uca.fr
|
f4ee0d7a71
|
merge from master and some fixes
|
2 years ago |
