 Alexandre AGOSTINHO
|
3039a0b74e
|
rename PasswordManager to PasswordSHA256 to distinguish corrctly the strategy. + add some doc
|
2 years ago |
|
Alexandre AGOSTINHO
|
8c85fee64d
|
change static attributes with std one in MasterManager
|
2 years ago |
|
Alexandre AGOSTINHO
|
41689ae1f5
|
fix merge conflict + build issues
|
2 years ago |
|
Alexandre AGOSTINHO
|
9a5d42c4a8
|
import - export work! - fix get the recipes of the current user
|
2 years ago |
|
Alexandre AGOSTINHO
|
8580a6c1a4
|
changes on passmgr hasher for a permanent one - add user ok
|
2 years ago |
|
Alexandre AGOSTINHO
|
fe3974c13c
|
add recipe & persistance work + upgrade console
|
2 years ago |
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
|
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 |
|
Alexandre AGOSTINHO
|
9eef461a44
|
working on MasterManager
|
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 |
|
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 |
|
Alexandre AGOSTINHO
|
1eab7059aa
|
fix merge conflict - need to rework ingredient to completly merge
|
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
|
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 |
|
Alexandre AGOSTINHO
|
d8d58997f9
|
fix merge conflict
|
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 |
|
Roxane ROSSETTO
|
8006b82d4d
|
conflict resolution
|
2 years ago |
|
Roxane ROSSETTO
|
0f7459a71f
|
conflict's resolution caused by switching branch too fast without saving
|
2 years ago |
|
Roxane ROSSETTO
|
b4ca357d92
|
I remove to_string() and I think user model is ready to use!!
|
2 years ago |
|
Alexandre AGOSTINHO
|
1049c8f6d9
|
impl in recipe and add author
|
2 years ago |
|
Alexandre AGOSTINHO
|
58902cea37
|
start comments
|
2 years ago |
|
Alexandre AGOSTINHO
|
a7d0de57f4
|
✨ XML DataContract working
|
2 years ago |
|
Alexandre AGOSTINHO
|
65a3c8feea
|
start Entry + changes on research/write mode
|
2 years ago |
|
Alexandre AGOSTINHO
|
2df795a347
|
select recipe on screen work
|
2 years ago |
|
Alexandre AGOSTINHO
|
0dd5e9bf7e
|
change RecipeCollection implementation to a child of a list
|
2 years ago |
