Commit graph

1691 commits

Author SHA1 Message Date
Vincent BRIDIER
68a7909414 Merge branch 'ticket831' into 'develop'
Ticket 831: Rework style Homepage BR Add

See merge request service-web-lab/le-gaulois!6
2022-05-25 08:54:26 +00:00
Jérémy Munsch
cf7364373e Ticket 831: Rework style Homepage BR Add 2022-05-25 08:54:26 +00:00
Vincent BRIDIER
136ebd7d96 Merge branch 'fix_updateBr' into 'develop'
fix reduction selection to allow for save

See merge request service-web-lab/le-gaulois!5
2022-05-20 14:14:38 +00:00
Olivier Legat
10e37465cf
fix reduction selection to allow for save 2022-05-20 15:23:21 +02:00
Vincent BRIDIER
a8e4d543ea Merge branch 'incoreader_patch' into 'develop'
patch xml inco reader to take format changes unto account : code/libelle...

See merge request service-web-lab/le-gaulois!4
2022-05-20 06:50:40 +00:00
Olivier Legat
a3f71e3a0d patch xml inco reader to take format changes unto account : code/libelle... 2022-05-20 06:50:40 +00:00
Vincent BRIDIER
d784b53366 Merge branch 'ticket879' into 'develop'
Ticket 879

See merge request service-web-lab/le-gaulois!3
2022-05-19 14:06:24 +00:00
Alexis Gousseau
8cd2f8540b Ticket 879
https://supportweb.ldc.fr/ticket/879
2022-05-19 14:06:23 +00:00
Vincent BRIDIER
d0dd947cb6 Merge branch 'ticket864' into 'develop'
Ticket864

See merge request service-web-lab/le-gaulois!2
2022-05-05 13:06:15 +00:00
Jérémy Munsch
4bcf77044e Ticket864 2022-05-05 13:06:15 +00:00
Vincent BRIDIER
1de71b491b Merge branch 'ticket852' into 'develop'
Ticket852

See merge request service-web-lab/le-gaulois!1
2022-05-05 13:05:02 +00:00
Jérémy Munsch
5989c04414 Ticket852 2022-05-05 13:05:02 +00:00
Jérémy Munsch
cfb576157e
Ticket 866 2022-05-03 10:41:05 +02:00
S. Hattry
ed82a65dcc add info message 2022-04-20 10:02:41 +02:00
S. Hattry
bcf712659f fix npm errors 2022-04-20 09:38:28 +02:00
S. Hattry
cc8e053efa fix spelling mistake 2022-04-15 10:10:24 +02:00
S. Hattry
59e7a5c737 auto format blade 2022-04-15 10:09:18 +02:00
Olivier Legat
85a4b4c14d Merge remote-tracking branch 'origin/ticket709' into develop 2022-04-07 10:52:22 +00:00
Olivier Legat
1b4ea7c05d Merge remote-tracking branch 'origin/ticket611' into develop 2022-04-07 10:50:16 +00:00
Alexis Gousseau
440226e6d2 Ticket 611 : change promotional image on homepage 2022-04-07 09:32:24 +02:00
Vincent BRIDIER
7cd31ff767
Merge remote-tracking branch 'origin/ticket629' into develop 2022-04-01 15:27:15 +02:00
Vincent BRIDIER
372929a071
Merge remote-tracking branch 'origin/ticket722' into develop 2022-04-01 15:25:20 +02:00
Alexis Gousseau
726019733a Ticket 629 : img ocb with only the wood part on brand page 2022-04-01 14:46:59 +02:00
Alexis Gousseau
9f0424fee7 Ticket 722 : height banners 2022-04-01 12:51:24 +02:00
Alexis Gousseau
f0f386e4b7 fix locale 2022-04-01 11:40:12 +02:00
Vincent BRIDIER
7b8e3f9702
Merge remote-tracking branch 'origin/hotfix' into develop 2022-03-31 09:57:55 +02:00
Jérémy Munsch
0925a4d471
AuthController : Fix old password check when changing while auth. 2022-03-31 09:05:08 +02:00
Olivier Legat
a38130fad4 Merge branch 'hotfix' into develop 2022-03-30 08:42:19 +00:00
Olivier Legat
9fd58311d6 log as error for invalid codes 2022-03-30 08:41:29 +00:00
Olivier Legat
831d4ce192 Merge branch 'develop' of https://voight001.lesidc.com/legaulois2020 into develop 2022-03-30 08:39:02 +00:00
Olivier Legat
8d50e3799f Merge branch 'hotfix' into develop 2022-03-30 08:34:19 +00:00
Olivier Legat
c09ef49612 fix error handling for decode 2022-03-30 08:31:41 +00:00
Jérémy Munsch
6dbfe43a67
Ticket 711: image recize on recipes.show 2022-03-29 10:51:45 +02:00
Vincent BRIDIER
e8c26e2a8d
Merge remote-tracking branch 'origin/ticket682' into develop 2022-03-28 17:04:45 +02:00
Jérémy Munsch
42eddd0040
Ticket 682 :
- Add Vue debug mode
- Show club.messages in reverse order + fix nice date formatter to using server timezone when json cast + fix get last message date for left column
2022-03-28 15:55:44 +02:00
Olivier Legat
49cbebc1fb Merge branch 'ticket722' into develop 2022-03-25 15:47:50 +00:00
Alexis Gousseau
87d5db9497 Ticket 722 : fix banner ocb/breeding pages 2022-03-25 09:59:44 +01:00
Olivier Legat
84d849e240 Merge branch 'trunk' 2022-03-24 15:03:47 +00:00
Olivier Legat
85e0559f3a Merge branch 'develop' into trunk 2022-03-24 14:56:49 +00:00
Olivier Legat
369acb5afc Merge branch 'ticket689' into develop 2022-03-24 14:56:32 +00:00
Alexis Gousseau
62e23f5eed Ticket 689 : fix breadcrumb article breeding page 2022-03-24 15:49:14 +01:00
Olivier Legat
6b4b72688d Merge branch 'trunk' 2022-03-23 09:11:04 +00:00
Olivier Legat
d3f0eaf2c8 Merge branch 'develop' into trunk 2022-03-23 09:10:44 +00:00
Olivier Legat
feb25ac953 désactivation de la schedule mail d'alerte éleveurs OCB 2022-03-23 09:10:32 +00:00
Olivier Legat
e914cf43d1 Merge branch 'trunk' 2022-03-22 15:39:15 +00:00
Olivier Legat
7860f25e0b Merge branch 'develop' into trunk 2022-03-22 14:44:22 +00:00
Olivier Legat
78ef557110 Merge remote-tracking branch 'origin/ticket747' into develop 2022-03-22 14:42:58 +00:00
Alexis Gousseau
e2efe1de6e Ticket 747 : change new packshot OCB 2022-03-22 15:24:39 +01:00
Olivier Legat
8e43e35565 Merge branch 'develop' into trunk 2022-03-22 14:01:48 +00:00
Olivier Legat
f1c77d57e5 Merge remote-tracking branch 'origin/ticket733' into develop 2022-03-22 14:01:17 +00:00