Code

Habit tracker backend#624

Code

Open

JesusFpz wants to merge 102 commits intomain4GeeksAcademy/react-flask-hello-deprecated:mainfrom

Habit-tracker-backend4GeeksAcademy/onmi-app:Habit-tracker-backendCopy head branch name to clipboard

Commits

Commits on Feb 28, 2025

• modeling

  LMezza

  committed
  56d1fe3

  Copy full SHA for 56d1fe3

• Merge pull request #1 from 4GeeksAcademy/data-base

  Show description for 648f983
  alejandronicolasdelalamo

  authored
  648f983

  Copy full SHA for 648f983

• First commit

  alejandronicolasdelalamo

  committed
  adae353

  Copy full SHA for adae353

Commits on Mar 1, 2025

• correccion de modelos

  LMezza

  committed
  90964c0

  Copy full SHA for 90964c0

• models

  LMezza

  committed
  6ebcd5e

  Copy full SHA for 6ebcd5e

• cleaning comments

  LMezza

  committed
  5226879

  Copy full SHA for 5226879

• Merge pull request #2 from 4GeeksAcademy/data-base

  Show description for 1f79857
  JesusFpz

  authored
  1f79857

  Copy full SHA for 1f79857

Commits on Mar 2, 2025

• navbar

  JesusFpz

  committed
  7d597f8

  Copy full SHA for 7d597f8

• Merge pull request #3 from 4GeeksAcademy/navbar

  Show description for 83c25d7
  Jujugm

  authored
  83c25d7

  Copy full SHA for 83c25d7

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into register

  alejandronicolasdelalamo

  committed
  27674a7

  Copy full SHA for 27674a7

Commits on Mar 3, 2025

• until /login at routes

  Jujugm

  committed
  1939897

  Copy full SHA for 1939897

• Merge pull request #4 from 4GeeksAcademy/getusers-createuser-protectedprofile-login

  Show description for d122fc9
  LMezza

  authored
  d122fc9

  Copy full SHA for d122fc9

Commits on Mar 4, 2025

• vista base de profile y logo sin fondo subida a navbar y login

  Jujugm

  committed
  d8efc37

  Copy full SHA for d8efc37

• Merge pull request #5 from 4GeeksAcademy/profile-view

  Show description for 6f416db
  alejandronicolasdelalamo

  authored
  6f416db

  Copy full SHA for 6f416db

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into register

  alejandronicolasdelalamo

  committed
  0842132

  Copy full SHA for 0842132

Commits on Mar 5, 2025

• Thememode1

  JesusFpz

  committed
  ef40be1

  Copy full SHA for ef40be1

• ActTheme

  JesusFpz

  committed
  3dee3f4

  Copy full SHA for 3dee3f4

• Mensaje de commit

  alejandronicolasdelalamo

  committed
  47d6ecf

  Copy full SHA for 47d6ecf

• Merge pull request #7 from 4GeeksAcademy/ThemeMode

  Show description for 8d34c8c
  LMezza

  authored
  8d34c8c

  Copy full SHA for 8d34c8c

• funcionalidades

  Jujugm

  committed
  d216960

  Copy full SHA for d216960

• descomentar logo

  Jujugm

  committed
  8656724

  Copy full SHA for 8656724

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into register

  alejandronicolasdelalamo

  committed
  7ab1834

  Copy full SHA for 7ab1834

• loginfunciona

  Jujugm

  committed
  9e1c771

  Copy full SHA for 9e1c771

• Merge pull request #10 from 4GeeksAcademy/login-funcionalidad

  Show description for 47b9e22
  alejandronicolasdelalamo

  authored
  47b9e22

  Copy full SHA for 47b9e22

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into register

  alejandronicolasdelalamo

  committed
  32cd90b

  Copy full SHA for 32cd90b

• Merge pull request #11 from 4GeeksAcademy/register

  Show description for ed657fc
  alejandronicolasdelalamo

  authored
  ed657fc

  Copy full SHA for ed657fc

Commits on Mar 6, 2025

• correccion de develop se elimina parte del merge de AA, se corrige home

  LMezza

  committed
  4c19e39

  Copy full SHA for 4c19e39

• Merge pull request #12 from 4GeeksAcademy/notes

  Show description for 20ff473
  LMezza

  authored
  20ff473

  Copy full SHA for 20ff473

• edicion de models y admin forms

  LMezza

  committed
  fbdef99

  Copy full SHA for fbdef99

• Resueltos conflictos en routes.py y loginview.js

  LMezza

  committed
  6abea9c

  Copy full SHA for 6abea9c

• profileview y logo cambio ruta

  Jujugm

  committed
  1c17ab3

  Copy full SHA for 1c17ab3

• Merge pull request #13 from 4GeeksAcademy/profile-view

  Show description for 9de1010
  LMezza

  authored
  9de1010

  Copy full SHA for 9de1010

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into data-base

  LMezza

  committed
  7b2dbab

  Copy full SHA for 7b2dbab

• edicion de models y admin.py

  LMezza

  committed
  5bd1777

  Copy full SHA for 5bd1777

• Merge pull request #14 from 4GeeksAcademy/data-base

  Show description for bd99fd8
  Jujugm

  authored
  bd99fd8

  Copy full SHA for bd99fd8

• rutas

  JesusFpz

  committed
  ea2296b

  Copy full SHA for ea2296b

• solucion

  JesusFpz

  committed
  b0f7e8f

  Copy full SHA for b0f7e8f

Commits on Mar 7, 2025

• landingpage y register

  alejandronicolasdelalamo

  committed
  da2071e

  Copy full SHA for da2071e

• Merge pull request #15 from 4GeeksAcademy/landingpage

  Show description for 06a0424
  alejandronicolasdelalamo

  authored
  06a0424

  Copy full SHA for 06a0424

• aaaaa

  Jujugm

  committed
  df2b640

  Copy full SHA for df2b640

• Merge pull request #16 from 4GeeksAcademy/profile-view

  Show description for 0e340c5
  alejandronicolasdelalamo

  authored
  0e340c5

  Copy full SHA for 0e340c5

• done 1 spring

  Jujugm

  committed
  bbef75d

  Copy full SHA for bbef75d

• actualizarmergenavbar

  JesusFpz

  committed
  7cb672a

  Copy full SHA for 7cb672a

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into navbar

  JesusFpz

  committed
  8b7ddc4

  Copy full SHA for 8b7ddc4

• backend fetch dinámico

  Jujugm

  committed
  3aa50d2

  Copy full SHA for 3aa50d2

• Merge pull request #18 from 4GeeksAcademy/profile-view

  Show description for 92da0a7
  alejandronicolasdelalamo

  authored
  92da0a7

  Copy full SHA for 92da0a7

• mejora del navbar

  JesusFpz

  committed
  0f7d9a8

  Copy full SHA for 0f7d9a8

• landingage2

  alejandronicolasdelalamo

  committed
  db2c1ea

  Copy full SHA for db2c1ea

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into navbar

  JesusFpz

  committed
  8a791ec

  Copy full SHA for 8a791ec

• actualizacionNavbarProfile

  JesusFpz

  committed
  653e2eb

  Copy full SHA for 653e2eb

• Merge pull request #19 from 4GeeksAcademy/navbar

  Show description for 590a916
  Jujugm

  authored
  590a916

  Copy full SHA for 590a916

Commits on Mar 8, 2025

• fix models

  LMezza

  committed
  80b6c9a

  Copy full SHA for 80b6c9a

• resolviendo conflicto de flux backend url

  LMezza

  committed
  aae090d

  Copy full SHA for aae090d

• register change

  alejandronicolasdelalamo

  committed
  2dd2ffb

  Copy full SHA for 2dd2ffb

• Merge pull request #20 from 4GeeksAcademy/register

  Show description for 161749e
  LMezza

  authored
  161749e

  Copy full SHA for 161749e

• register

  LMezza

  committed
  784c435

  Copy full SHA for 784c435

• resolving merge de profile

  LMezza

  committed
  576b4d0

  Copy full SHA for 576b4d0

• notes front end, card, form de maapeo, edit, create

  LMezza

  committed
  2ce4797

  Copy full SHA for 2ce4797

Commits on Mar 9, 2025

• funcionalidades login y register , alerts y encript pw

  Jujugm

  committed
  acd793e

  Copy full SHA for acd793e

• Merge pull request #21 from 4GeeksAcademy/funcionalidad-register

  Show description for 572284b
  JesusFpz

  authored
  572284b

  Copy full SHA for 572284b

• cardnote y formnote

  LMezza

  committed
  580c99a

  Copy full SHA for 580c99a

• git pull de develop ultima edicion de julia

  LMezza

  committed
  e5f02aa

  Copy full SHA for e5f02aa

• navbar logout y auth

  JesusFpz

  committed
  51f3e26

  Copy full SHA for 51f3e26

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into landingpage

  alejandronicolasdelalamo

  committed
  5b71f07

  Copy full SHA for 5b71f07

• merge

  LMezza

  committed
  d90b65e

  Copy full SHA for d90b65e

• navbar dropdown

  JesusFpz

  committed
  49d92d6

  Copy full SHA for 49d92d6

• Merge pull request #22 from 4GeeksAcademy/navbar

  Show description for 7194ef9
  LMezza

  authored
  7194ef9

  Copy full SHA for 7194ef9

• conflicto de migrations

  LMezza

  committed
  07e2808

  Copy full SHA for 07e2808

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into landingpage

  alejandronicolasdelalamo

  committed
  a2a62d0

  Copy full SHA for a2a62d0

• modeling category and role, end point y flux register

  LMezza

  committed
  032d052

  Copy full SHA for 032d052

• Merge pull request #23 from 4GeeksAcademy/data-base

  Show description for 98b6d32
  Jujugm

  authored
  98b6d32

  Copy full SHA for 98b6d32

• Merge branch 'develop' of https://github.com/4GeeksAcademy/onmi-app into landingpage

  alejandronicolasdelalamo

  committed
  18f031f

  Copy full SHA for 18f031f

• landing y footer

  alejandronicolasdelalamo

  committed
  5dbe347

  Copy full SHA for 5dbe347

• Merge pull request #24 from 4GeeksAcademy/landingpage

  Show description for a166d93
  LMezza

  authored
  a166d93

  Copy full SHA for a166d93

• navbar mejorado

  JesusFpz

  committed
  139e671

  Copy full SHA for 139e671

Commits on Mar 10, 2025

• navbar finalizado

  JesusFpz

  committed
  028952e

  Copy full SHA for 028952e

• Merge pull request #25 from 4GeeksAcademy/navbar

  Show description for a7932e3
  alejandronicolasdelalamo

  authored
  a7932e3

  Copy full SHA for a7932e3

• dd

  Jujugm

  committed
  a24e807

  Copy full SHA for a24e807

• navbar

  LMezza

  committed
  6aa4455

  Copy full SHA for 6aa4455

• navbar

  LMezza

  committed
  654c066

  Copy full SHA for 654c066

• actualizacion de navbar

  LMezza

  committed
  4651a8b

  Copy full SHA for 4651a8b

• base de datos edicion de role descomentado

  LMezza

  committed
  1dc5ac3

  Copy full SHA for 1dc5ac3

• Merge pull request #26 from 4GeeksAcademy/data-base

  Show description for c6e6b35
  JesusFpz

  authored
  c6e6b35

  Copy full SHA for c6e6b35

• first editprofile

  alejandronicolasdelalamo

  committed
  ecba69f

  Copy full SHA for ecba69f

Commits on Mar 12, 2025

• pomodoro injerct

  Jujugm

  committed
  d7114e1

  Copy full SHA for d7114e1

• pomodoro y merge

  Jujugm

  committed
  ef5083a

  Copy full SHA for ef5083a

• endpoints post,get,detele

  JesusFpz

  committed
  36e05e6

  Copy full SHA for 36e05e6

Commits on Mar 13, 2025

• pomodoro terminado

  Jujugm

  committed
  8c9f610

  Copy full SHA for 8c9f610

• Merge pull request #28 from 4GeeksAcademy/profile-view

  Show description for d301228
  LMezza

  authored
  d301228

  Copy full SHA for d301228

• editprofile

  alejandronicolasdelalamo

  committed
  e54ca7e

  Copy full SHA for e54ca7e

• Merge pull request #29 from 4GeeksAcademy/editprofile

  Show description for 111bc43
  JesusFpz

  authored
  111bc43

  Copy full SHA for 111bc43

Commits on Mar 14, 2025

• no se

  JesusFpz

  committed
  12b532b

  Copy full SHA for 12b532b

• clean db

  Jujugm

  committed
  c01015d

  Copy full SHA for c01015d

• Merge pull request #30 from 4GeeksAcademy/avatar

  Show description for ed23442
  JesusFpz

  authored
  ed23442

  Copy full SHA for ed23442

• cleanConsole

  JesusFpz

  committed
  a2ce222

  Copy full SHA for a2ce222

• post,get,delet protegidos

  JesusFpz

  committed
  fcb68d4

  Copy full SHA for fcb68d4

Commits on Mar 15, 2025

• navbarsa

  JesusFpz

  committed
  d02875f

  Copy full SHA for d02875f

• arreglo navbar1raparte

  JesusFpz

  committed
  f5f4beb

  Copy full SHA for f5f4beb

Commits on Mar 16, 2025

• arreglo navbar

  JesusFpz

  committed
  05c5780

  Copy full SHA for 05c5780

• conflicto navbar solucionado

  JesusFpz

  committed
  1c318a9

  Copy full SHA for 1c318a9

• Merge pull request #31 from 4GeeksAcademy/navbar

  Show description for 94fceb0
  LMezza

  authored
  94fceb0

  Copy full SHA for 94fceb0

• habit new actualizado

  JesusFpz

  committed
  8abc4df

  Copy full SHA for 8abc4df