Ferme

You've already forked Ferme

Code Issues Pull Requests 3 Actions Packages Projects Releases 83 Wiki Activity

Compare commits

base: MALIO-DEV:29c98407f1692a8cb1cd5bf2a8460c416ef67734

MALIO-DEV:develop MALIO-DEV:feat/entree-sortie MALIO-DEV:feature/FER-18-mise-a-jour-du-tableau-d-arrivage MALIO-DEV:fix/CI-CD MALIO-DEV:feat/266-creation-composant-datatable MALIO-DEV:feat/319-loader-skeleton MALIO-DEV:feat/poc-identification-bovin MALIO-DEV:feat/276-lister-expeditions-terminees MALIO-DEV:fix/-style-global MALIO-DEV:feat/admin-users MALIO-DEV:feat/test-unitaire MALIO-DEV:feat/202-connexion-utilisateur MALIO-DEV:feat/ajout-lib-nuxt-icon MALIO-DEV:main

...

compare: MALIO-DEV:0c85e48ff438e8bc4c5d1d5534e4da17355a2de4

Branches Tags

2 Commits

29c98407f1 ... 0c85e48ff4

Author	SHA1	Message	Date
AUTIN Tristan	0c85e48ff4	Merge branch 'develop' into feat/203-reception-parcours-pesee-multi-etapas # Conflicts: # .idea/workspace.xml # frontend/composables/useApi.ts # frontend/layouts/default.vue # frontend/nuxt.config.ts	2026-01-13 16:22:36 +01:00
AUTIN Tristan	9fb0fc12b8	Ajout de conf front (Nuxt, useApi, tailwind) (!2 ) \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| \| \| ## Description de la PR ## Modification du .env ## Check list - [ ] Pas de régression - [ ] TU/TI/TF rédigée - [ ] TU/TI/TF OK - [ ] CHANGELOG modifié Reviewed-on: #2 Reviewed-by: THOLOT DECHENE Matthieu <matthieu@yuno.malio.fr> Co-authored-by: AUTIN Tristan <tristan@yuno.malio.fr> Co-committed-by: AUTIN Tristan <tristan@yuno.malio.fr>	2026-01-12 16:21:17 +00:00

Author

SHA1

Message

Date

AUTIN Tristan

0c85e48ff4

Merge branch 'develop' into feat/203-reception-parcours-pesee-multi-etapas

# Conflicts:
#	.idea/workspace.xml
#	frontend/composables/useApi.ts
#	frontend/layouts/default.vue
#	frontend/nuxt.config.ts

2026-01-13 16:22:36 +01:00

AUTIN Tristan

9fb0fc12b8

Ajout de conf front (Nuxt, useApi, tailwind) (!2 )

| Numéro du ticket | Titre du ticket |
|------------------|-----------------|
|                  |                 |

## Description de la PR

## Modification du .env

## Check list

- [ ] Pas de régression
- [ ] TU/TI/TF rédigée
- [ ] TU/TI/TF OK
- [ ] CHANGELOG modifié

Reviewed-on: #2
Reviewed-by: THOLOT DECHENE Matthieu <matthieu@yuno.malio.fr>
Co-authored-by: AUTIN Tristan <tristan@yuno.malio.fr>
Co-committed-by: AUTIN Tristan <tristan@yuno.malio.fr>

2026-01-12 16:21:17 +00:00

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

Compare commits

2 Commits 29c98407f1 ... 0c85e48ff4

Diff Content Not Available

2 Commits

29c98407f1 ... 0c85e48ff4