 Lucas DELANIER
|
5ec32fe705
|
Merge branch 'report_user'
# Conflicts:
# Sources/dafl_project_flutter/assets/logs.txt
|
2 years ago |
|
Lucas DELANIER
|
aa7a7e3aa7
|
setup for merge
|
2 years ago |
 Félix MIELCAREK
|
23ec0e3751
|
Ajout et suppression dans la playlist.
Début de l'ajout d'une image à la playlist.
|
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 |
|
Félix MIELCAREK
|
e86bfbc017
|
Update '.drone.yml'
|
2 years ago |
 Dorian HODIN
|
8d88ed4b1b
|
Supprimer 'Sources/dafl_project_flutter/linux/flutter/generated_plugins.cmake'
|
2 years ago |
|
Dorian HODIN
|
d5ed73eaf9
|
Supprimer 'Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.h'
|
2 years ago |
|
Dorian HODIN
|
c4ee33bd19
|
Supprimer 'Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.cc'
|
2 years ago |
|
dorian.hodin
|
330e129891
|
Merge branch 'Link_UserList_To_SpotifyInfo'
|
2 years ago |
|
dorian.hodin
|
3263fa6578
|
Adding Spotify music ID to the location database
|
2 years ago |
|
Félix MIELCAREK
|
d388f4d77e
|
Suite travail sur playlist Spotify.
|
2 years ago |
|
Dorian HODIN
|
f71d22c1d9
|
Location Send Info every 72 sec
|
2 years ago |
|
Félix MIELCAREK
|
9275d363c4
|
Petits changements.
|
2 years ago |
|
Félix MIELCAREK
|
2d3c90b8c7
|
Ajout de la vérification de l'écoute d'une musique et execution en conséquence.
|
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 |
|
Félix MIELCAREK
|
c227d05883
|
Ajout gestion des erreurs pour l'API Spotify.
Début de la gestion des playlists Spotify.
|
2 years ago |
|
Lucas DELANIER
|
bd50b7aba9
|
reglage probleme liste spots
|
2 years ago |
|
Lucas DELANIER
|
0739fa47b1
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
dorian.hodin
|
8fb44b077e
|
Merge branch 'LinkDataPhpFlutter'
|
2 years ago |
|
Dorian HODIN
|
33cfa6bf7c
|
Supprimer 'Sources/.gitkeep'
|
2 years ago |
|
dorian.hodin
|
c8b3f11ab0
|
Problem resolution 5
|
2 years ago |
|
dorian.hodin
|
17b73282bc
|
Problem resolution 4
|
2 years ago |
|
dorian.hodin
|
4c6ebfab8d
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Dorian HODIN
|
5db108fe39
|
Supprimer 'Sources/phpLocation/.idea/workspace.xml'
|
2 years ago |
|
dorian.hodin
|
685d9b28a8
|
Merge branch 'LinkDataPhpFlutter'
# Conflicts:
# .idea/Daflv4.iml
|
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 |
|
Dorian HODIN
|
2554b885ec
|
Supprimer 'Sources/dafl_project_flutter/assets/logs.txt'
|
2 years ago |
|
Dorian HODIN
|
a91ff70494
|
Supprimer 'Sources/phpLocation/.idea/workspace.xml'
|
2 years ago |
|
dorian.hodin
|
a8c997c5f7
|
Problem resolution 3
|
2 years ago |
|
dorian.hodin
|
2bfef1bdc7
|
Problem resolution 2
|
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 |
|
Félix MIELCAREK
|
6111ad92cb
|
Résolution erreur build.
|
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
|
0712391228
|
Mise à jour de 'Sources/dafl_project_flutter/pubspec.yaml'
|
2 years ago |
|
Dorian HODIN
|
f75065d471
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# .idea/libraries/Dart_SDK.xml
|
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 |
 Audric SABATIER
|
3130556962
|
Merge branch '#DB02/SIgnINUPNotify'
# Conflicts:
# .idea/libraries/Dart_Packages.xml
# .idea/libraries/Dart_SDK.xml
# Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
|
2 years ago |
|
Dorian HODIN
|
bbed23353f
|
Supprimer 'Documentation/Images/backlog.pdf'
|
2 years ago |
|
Dorian HODIN
|
a64782a6c4
|
Transférer les fichiers vers 'Documentation/Images'
|
2 years ago |
|
Dorian HODIN
|
2ae7f8a8d8
|
Supprimer 'Documentation/Images/Backlog.png'
|
2 years ago |
|
Dorian HODIN
|
73ff29b578
|
Transférer les fichiers vers 'Documentation/Images'
|
2 years ago |
|
Dorian HODIN
|
6bdc767508
|
Deleting PhpLocation from the branch (the php script are now on a server)
|
2 years ago |
