Roxane ROSSETTO
|
a3989b1a11
|
Modification of Recipe's constructor. Add recipe's picture. Changement of bindings in MyProfil, App and Home
|
2 years ago |
|
Roxane ROSSETTO
|
77984ad596
|
merge's resolution not finish
|
2 years ago |
|
Roxane ROSSETTO
|
924d66dbe2
|
modification de la recette(ajout image), copie du home xaml et cs, binding profil
|
2 years ago |
 Alexandre AGOSTINHO
|
7602d9f789
|
fix some bugs, main-connection-searcher is working
|
2 years ago |
|
Alexandre AGOSTINHO
|
6116578585
|
connection 1st ver. + view profile 1st ver. - error on login
|
2 years ago |
|
Alexandre AGOSTINHO
|
04192a2ef2
|
new main menu working
|
2 years ago |
|
Alexandre AGOSTINHO
|
34de5e0b85
|
done first ver. of MasterManager
|
2 years ago |
|
Alexandre AGOSTINHO
|
31fec8e200
|
fix conflicts
|
2 years ago |
|
Roxane ROSSETTO
|
96954e6c94
|
implementation of an addRecipe
|
2 years ago |
|
Alexandre AGOSTINHO
|
9eef461a44
|
working on MasterManager
|
2 years ago |
|
Roxane ROSSETTO
|
47ef6838a4
|
urge
|
2 years ago |
|
Alexandre AGOSTINHO
|
b6729c5f68
|
Merge pull request 'feature/21-ingredient' (#47) from feature/21-ingredient into dev
Reviewed-on: #47
|
2 years ago |
|
Alexandre AGOSTINHO
|
01fe143c7f
|
add some functions to simplify the access of data
|
2 years ago |
|
Alexandre AGOSTINHO
|
950a6f99bf
|
move datamanagers in model, add author properties in recipe
|
2 years ago |
|
Alexandre AGOSTINHO
|
86f6f73cea
|
fix ingredient
|
2 years ago |
|
Alexandre AGOSTINHO
|
91573ffdea
|
fix namespace ingredient
|
2 years ago |
|
Alexandre AGOSTINHO
|
48b64facc2
|
fix sln conflict 2
|
2 years ago |
|
Roxane ROSSETTO
|
9a03d8c117
|
there was an error with unit test of user, because of constructor changement
|
2 years ago |
|
Alexandre AGOSTINHO
|
0ca871a1db
|
fix sln conflict
|
2 years ago |
|
Roxane ROSSETTO
|
82255808a9
|
implementation of a void constructor of user and a copy constructor. Binding between flyoutContainer and MyProfil views
|
2 years ago |
|
Roxane
|
5a255642b5
|
binding name, surname and mail of user in profil view
|
2 years ago |
|
Roxane
|
54cf493fba
|
fix merge
|
2 years ago |
|
Roxane
|
f712a13cdb
|
start bonding myProfil
|
2 years ago |
|
Alexandre AGOSTINHO
|
1eab7059aa
|
fix merge conflict - need to rework ingredient to completly merge
|
2 years ago |
|
Alexandre AGOSTINHO
|
cf98aee581
|
Merge pull request 'Implementation des commentaires' (#44) from feature/40-comments into dev
Reviewed-on: #44
|
2 years ago |
|
Alexandre AGOSTINHO
|
9ce02d1592
|
merge of comment and user ok - JSONserializer not working
|
2 years ago |
|
Roxane ROSSETTO
|
6e5b6ca7a9
|
implementation of datacontract on ingredient
|
2 years ago |
|
Roxane ROSSETTO
|
a93132f712
|
correction of the last merge
|
2 years ago |
|
Roxane ROSSETTO
|
190e35b54b
|
feature/18-model-user merged on dev
|
2 years ago |
|
Alexandre AGOSTINHO
|
ffd3b1cb76
|
won't build until fix datapersistance in User
|
2 years ago |
|
Alexandre AGOSTINHO
|
e9a78a4874
|
cm bf m user for data persistance correction
|
2 years ago |
|
Alexandre AGOSTINHO
|
57a9b27d1c
|
fix merge conflict (without testing
|
2 years ago |
|
Alexandre AGOSTINHO
|
02c5d5b583
|
done reviews
|
2 years ago |
|
Roxane
|
effa6cece6
|
modification to resolve the conflict
|
2 years ago |
|
Roxane ROSSETTO
|
367efb1499
|
Very little modification on User class to merge it in a new branch
|
2 years ago |
|
Roxane ROSSETTO
|
5657230234
|
correction of the Equals method
|
2 years ago |
|
Roxane
|
d4dcbc95ef
|
Follow Drone's advices and correct Equal property
|
2 years ago |
|
Roxane
|
7758ed4401
|
test correct 1
|
2 years ago |
|
Roxane
|
6b424b0304
|
correction of tests after seeing drone alert
|
2 years ago |
|
Roxane
|
dc8214915a
|
Ingredient class finished and tested
|
2 years ago |
|
Roxane
|
649ed6f72f
|
Enumeration of units, quantity class and ingredient class are finished. Unit test of the ingredient class are done. I'm going to test them in the stub
|
2 years ago |
|
Roxane
|
dcb515b79d
|
unit-tests for user class
|
2 years ago |
|
Alexandre AGOSTINHO
|
7a15ac8b49
|
Merge pull request 'Base de la persistance des données' (#39) from feature/36-persistance into dev
Reviewed-on: #39
|
2 years ago |
|
Alexandre AGOSTINHO
|
d8d58997f9
|
fix merge conflict
|
2 years ago |
|
Alexandre AGOSTINHO
|
2d87ff5c84
|
Merge pull request 'Base des menus de l'application console' (#38) from feature/31-menu-console into dev
Reviewed-on: #38
|
2 years ago |
|
Roxane ROSSETTO
|
e3d83292b8
|
I forgot to save Quantity... second push
|
2 years ago |
|
Roxane ROSSETTO
|
6376250b45
|
enum unit finished and quantity class finished, and I'm working on Ingredient
|
2 years ago |
|
Roxane ROSSETTO
|
ff6823c7d5
|
Password property changed
|
2 years ago |
|
Roxane ROSSETTO
|
db4b1da048
|
cleaning branch
|
2 years ago |
|
Roxane ROSSETTO
|
40e302a481
|
bis
|
2 years ago |
