 Félix MIELCAREK
|
d605c45f91
|
Merge remote-tracking branch 'origin/api'
# Conflicts:
# .idea/Daflv4.iml
# .idea/libraries/Dart_Packages.xml
# Sources/dafl_project_flutter/lib/controller/controller.dart
# Sources/dafl_project_flutter/lib/model/user.dart
|
2 years ago |
 Lucas DELANIER
|
7dc244b00e
|
Merge branch 'change_toast'
# Conflicts:
# .idea/libraries/Dart_SDK.xml
|
2 years ago |
|
Lucas DELANIER
|
25b311dd20
|
toast now display "already in discovery" when clicking when already in the playlist
|
2 years ago |
dorian.hodin
|
9e5c49d7ac
|
Merge branch 'Link_UserList_To_SpotifyInfo'
|
2 years ago |
|
dorian.hodin
|
35232657e5
|
Add the current Music from near User in discovery (wrong list for now)
|
2 years ago |
 Dorian HODIN
|
665a33cb63
|
Function now in user.dart
|
2 years ago |
|
Lucas DELANIER
|
5ec32fe705
|
Merge branch 'report_user'
# Conflicts:
# Sources/dafl_project_flutter/assets/logs.txt
|
2 years ago |
|
Lucas DELANIER
|
9ea5a930e1
|
ajout report de user par mail api emailjs
|
2 years ago |
|
dorian.hodin
|
6290ec24c1
|
String of the user to tracklist
|
2 years ago |
|
Félix MIELCAREK
|
cc1928624d
|
Rectification de l'emplacement de certaines méthodes.
Corrections de l'articulation des classes.
|
2 years ago |
|
Dorian HODIN
|
f71d22c1d9
|
Location Send Info every 72 sec
|
2 years ago |
|
Félix MIELCAREK
|
850fb277d3
|
Ajout de la dernière musique écoutée sur la page profil.
Nettoyage du code.
|
2 years ago |
|
Lucas DELANIER
|
0739fa47b1
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
dorian.hodin
|
17b73282bc
|
Problem resolution 4
|
2 years ago |
|
Lucas DELANIER
|
d45eef9f58
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# .idea/libraries/Dart_SDK.xml
|
2 years ago |
|
Lucas DELANIER
|
d9845f5fc7
|
reglage probleme liste spots
|
2 years ago |
|
dorian.hodin
|
d3abee6e4b
|
Merge branch 'LinkDataPhpFlutter'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# .idea/libraries/Dart_SDK.xml
# Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart
|
2 years ago |
|
dorian.hodin
|
6e8d5ab418
|
Problem resolution
|
2 years ago |
|
Félix MIELCAREK
|
069cbe873d
|
Merge branche Lucas et master.
|
2 years ago |
|
Félix MIELCAREK
|
fe281b9ea2
|
Merge remote-tracking branch 'origin/messagerie_link_view'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# Sources/dafl_project_flutter/lib/controller/controller.dart
# Sources/dafl_project_flutter/lib/main.dart
# Sources/dafl_project_flutter/lib/model/user.dart
# Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart
# Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
# Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_top.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
# Sources/dafl_project_flutter/pubspec.yaml
|
2 years ago |
|
Lucas DELANIER
|
d265a8e49f
|
commit avant merge
|
2 years ago |
|
Félix MIELCAREK
|
df3821009d
|
Merge branche api et master.
Correction du code.
|
2 years ago |
|
Félix MIELCAREK
|
1f1d0f83c2
|
Merge branch 'api-implementation'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# .idea/libraries/Dart_SDK.xml
# Sources/dafl_project_flutter/.metadata
# Sources/dafl_project_flutter/android/app/build.gradle
# Sources/dafl_project_flutter/lib/main.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
# Sources/dafl_project_flutter/pubspec.lock
# Sources/dafl_project_flutter/pubspec.yaml
|
2 years ago |
|
Dorian HODIN
|
6470cbe7b2
|
Merge branch 'LinkDataPhpFlutter'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# .idea/libraries/Dart_SDK.xml
# Sources/dafl_project_flutter/ios/Runner/Info.plist
# Sources/dafl_project_flutter/lib/main.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
# Sources/dafl_project_flutter/pubspec.lock
# Sources/dafl_project_flutter/pubspec.yaml
|
2 years ago |
|
Dorian HODIN
|
69560308a0
|
Link real username to location script
|
2 years ago |
 Audric SABATIER
|
b1b1f507f2
|
ADD : User login (password verification + username) and notification if there is a problem
|
2 years ago |
|
Audric SABATIER
|
92c46322ff
|
Fix : fix asynchronous bug in searchByUsername Function. (the return was before the asynchronous call)
|
2 years ago |
|
Lucas DELANIER
|
e332d84deb
|
commit
|
2 years ago |
|
Lucas DELANIER
|
7763284364
|
rectification bug setstate
|
2 years ago |
|
Lucas DELANIER
|
08ca05f6f4
|
page conversation fonctionnelle
|
2 years ago |
|
Lucas DELANIER
|
8c5bdfe940
|
page conversation fonctionnelle
|
2 years ago |
|
Félix MIELCAREK
|
412748862a
|
Poursuite implémentation API
|
2 years ago |
|
Lucas DELANIER
|
84ad3100ee
|
add action when tap on send button
|
2 years ago |
|
Lucas DELANIER
|
f7db676502
|
creation page tops
|
2 years ago |
|
Félix MIELCAREK
|
5ad5ccadaf
|
Changement de méthode pour requete vers API.
|
2 years ago |
|
Audric SABATIER
|
0784d8f074
|
Fix : Modification des attributs nullable et non nullable, late pour instanciation future.
|
2 years ago |
|
Lucas DELANIER
|
d16608ea80
|
spot est maintenant une classe
|
3 years ago |
|
Audric SABATIER
|
77d5557743
|
ADD : ajout d'une classe de recherche d'un utilisateur en base de données. Notification à l'utilisateur quand il rentre un username déja utilisé.
|
3 years ago |
|
Lucas Delanier
|
eb9aea416c
|
commit merge linkView and master
|
3 years ago |
|
Lucas Delanier
|
cbbbfbfa95
|
commit merge linkView and master
|
3 years ago |
|
Lucas Delanier
|
aeb30917f5
|
Merge branch 'Link_View_To_Modele'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# Sources/dafl_project_flutter/lib/controller/controller.dart
# Sources/dafl_project_flutter/lib/main.dart
# Sources/dafl_project_flutter/lib/model/user.dart
# Sources/dafl_project_flutter/lib/persistence/database_connexion.dart
# Sources/dafl_project_flutter/lib/persistence/database_loader.dart
# Sources/dafl_project_flutter/lib/persistence/database_saver.dart
# Sources/dafl_project_flutter/lib/persistence/loader.dart
# Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_card.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart
# Sources/dafl_project_flutter/lib/views/pages/main/w_spot.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
# Sources/dafl_project_flutter/pubspec.lock
# Sources/dafl_project_flutter/pubspec.yaml
|
3 years ago |
|
Lucas Delanier
|
9d92c329a3
|
commit merge
|
3 years ago |
|
Lucas DELANIER
|
600550a57c
|
merge master
|
3 years ago |
|
Lucas DELANIER
|
ba51e73079
|
notify
|
3 years ago |
|
Lucas DELANIER
|
af850b03ad
|
dismissible discovery
|
3 years ago |
|
Audric SABATIER
|
19e667a2c2
|
init branch
|
3 years ago |
|
Lucas DELANIER
|
83b2755f32
|
manage error sign up
|
3 years ago |
|
Félix MIELCAREK
|
2b866941cc
|
Apply merge
|
3 years ago |
|
Félix MIELCAREK
|
1f9587762a
|
Merge remote-tracking branch 'origin/api-implementation-v2' into api-implementation
# Conflicts:
# Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart
# Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart
# Sources/dafl_project_flutter/pubspec.lock
# Sources/dafl_project_flutter/pubspec.yaml
|
3 years ago |
|
Lucas Delanier
|
63640c8c2a
|
mise a jour binding discovery
|
3 years ago |
