Commits · fa1d8dd126ad6e3aad2f7f6fc905a4e1c112af1a · Matis SPINELLI / ElBuenoPeso

22 Feb, 2024 6 commits
- Merge branch 'db_creation' · fa1d8dd1
  m-spi authored Feb 22, 2024
```
# Conflicts:
#	app/src/main/java/com/example/elbuenopeso/ui/market/MarketFragment.kt
#	app/src/main/res/layout/fragment_market.xml
```
  fa1d8dd1
- corec · 1286f639
  m-spi authored Feb 22, 2024
  
  1286f639
- merge · 24cf71fb
  m-spi authored Feb 22, 2024
  
  24cf71fb
- CA MARCHE ! (accès bdd) · e0c03ed1
  m-spi authored Feb 22, 2024
  
  e0c03ed1
- On fait quelque progrès... · 44cc7624
  m-spi authored Feb 22, 2024
  
  44cc7624
- rien qui marche · 16ad45d7
  m-spi authored Feb 22, 2024
  
  16ad45d7
21 Feb, 2024 7 commits
- draft db · fd794904
  Alutulu authored Feb 21, 2024
  
  fd794904
- Corrections des XML · b716a458
  m-spi authored Feb 21, 2024
  
  b716a458
- grid view implemented · d95f8def
  Timothé KOBAK authored Feb 21, 2024
  
  d95f8def
- Merge correction · d1ee753c
  m-spi authored Feb 21, 2024
  
  d1ee753c
- Merge branch 'master' into matis · 7831ea9b
  m-spi authored Feb 21, 2024
```
# Conflicts:
#	app/src/main/res/layout/activity_main.xml
```
  7831ea9b
- Enfin, une structure de page cohérente, et des boutons qui marchent (maybe) · 946609c5
  m-spi authored Feb 21, 2024
  
  946609c5
- arrondit nbr · 07e62214
  Alutulu authored Feb 21, 2024
  
  07e62214
20 Feb, 2024 4 commits
- Dark mode implemented · b2bc3455
  Timothé KOBAK authored Feb 20, 2024
  
  b2bc3455
- UI improvement and about page · 091f7a15
  Timothé KOBAK authored Feb 20, 2024
  
  091f7a15
- UI · eb647a7e
  Timothé KOBAK authored Feb 20, 2024
  
  eb647a7e
- UI · 6dcea307
  Timothé KOBAK authored Feb 20, 2024
  
  6dcea307
21 Feb, 2024 3 commits
- Merge remote-tracking branch 'origin/master' · 469dc9fe
  Alutulu authored Feb 21, 2024
  
  469dc9fe
- rename things · ca5a92dd
  Alutulu authored Feb 21, 2024
  
  ca5a92dd
- pichu fix · 2d5ea4ce
  Alutulu authored Feb 21, 2024
  
  2d5ea4ce
20 Feb, 2024 3 commits
- Merge remote-tracking branch 'origin/master' · f55acfa4
  Timothé KOBAK authored Feb 20, 2024
  
  f55acfa4
- Bonus Button : Settings Exit added · ba02b6a8
  Timothé KOBAK authored Feb 20, 2024
  
  ba02b6a8
- UI · d8f27b64
  Timothé KOBAK authored Feb 20, 2024
  
  d8f27b64
16 Feb, 2024 2 commits
- marche pas... · a7b30035
  m-spi authored Feb 16, 2024
  
  a7b30035
- Merge branch 'displayList' · 202907bd
  Alutulu authored Feb 16, 2024
```
# Conflicts:
#	app/src/main/java/com/example/elbuenopeso/ui/dashboard/DashboardFragment.kt
```
  202907bd
17 Feb, 2024 1 commit
- UI · 7f23187c
  Timothé KOBAK authored Feb 17, 2024
  
  7f23187c
16 Feb, 2024 2 commits
- pichu update · 8030d4ff
  Alutulu authored Feb 16, 2024
  
  8030d4ff
- J'ai fini ma journée ciao · 6c2fff6d
  m-spi authored Feb 16, 2024
  
  6c2fff6d
17 Feb, 2024 1 commit
- UI · a90963cf
  Timothé KOBAK authored Feb 17, 2024
  
  a90963cf
16 Feb, 2024 9 commits
- Reset Done · 78f44799
  m-spi authored Feb 16, 2024
  
  78f44799
- premiere page mais crash · ca97baf0
  Timothé KOBAK authored Feb 16, 2024
  
  ca97baf0
- Reset Done · f784b1f2
  m-spi authored Feb 16, 2024
  
  f784b1f2
- init2 · 132ef5d7
  m-spi authored Feb 16, 2024
  
  132ef5d7
- Merge remote-tracking branch 'origin/master' · 23dec42f
  Alutulu authored Feb 16, 2024
  
  23dec42f
- premiere page mais crash · db649d67
  Timothé KOBAK authored Feb 16, 2024
  
  db649d67
- premiere page mais crash · 4acd6f2a
  Timothé KOBAK authored Feb 16, 2024
  
  4acd6f2a
- deployment ?? · cc191e63
  Alutulu authored Feb 16, 2024
  
  cc191e63
- Init · 4e06a022
  m-spi authored Feb 16, 2024
  
  4e06a022