Commit graph

380 commits

Author SHA1 Message Date
Vincent BRIDIER
56f90ffdb2 Merge branch 'develop' into trunk 2022-05-25 09:56:10 +02:00
Jérémy Munsch
1694d2715a
Fix #793 : Add sites on projects.edit 2022-05-24 09:47:58 +02:00
Jérémy Munsch
d0ef07af28 1.0.9 Macro planning Release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEENM6P8RR0Fd/BNUDJGDYa87/sD+wFAmKLe4gACgkQGDYa87/s
 D+wuZBAA4j+2qQFS0MB2lWW94thYWGI1HiHioexeB6a9hJ5CjDLGSTIR70m72/YU
 k2CeXuSY/VbEfPPQzIBzxx/B1tkkd79ZlxSM20TRWsPg0BMXKBXclT2cJ2VnJ1is
 b3zXZ5vbNoigKBWa5bIRhGgEhdX/Y6ggEpgpohj69ndeGL4TPqIxrTMtO2Y6EfZY
 ZvNNI/tkEoOEdXiZvcGXOf5L161u+7glf/bFyAzDtjhBvKWN+5epp2IBa0+hEnoA
 Pq+4C2u7B6zBHTuc8G/xy1go7FgX3C5PWnJXZit9vMnLxgdLO8mKbJS8ZtnWozvp
 o0QSbgQOxZzIIbaBRtUfuVO9rbDapmHxip1zt8xAeedP8COzBF/EsoSbl7HA00Zb
 UAnQ4hHj3W4XNNhl4qjmZXrXi+wne9DJB8Gbv8hVk0cd6VPhOmoUvweOHVE3Mll+
 Jm779kfYnJPQzu5msp93RBtOAgKFJzx+6l+vBu7pD4cf/6Sy2yi8zUZ+BnDP+GTa
 816GVwljuf4B4e2pplsftH0EfQLR3gabFuS1Hx1DskWdE1xf8MgmiC2N6hGxi698
 OuhM7qLEbdoeeCEuseLkdD6Qlzuo9szRl7YFNiQcbo4f3n4qP/l2zIZOcMqAF1xM
 I5RtcMZWfHzj1T9hH/+e5W47gBUA2G+YsQBxZXPvQihEs2Ihjfc=
 =ATj/
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEENM6P8RR0Fd/BNUDJGDYa87/sD+wFAmKLe60ACgkQGDYa87/s
 D+xotw//auM7sIxAM1P1vqvQypKvXqau95ikEoTETCeJpQvaK9vS22hY1EfmJSNA
 pJkXBYvJG5TNuNYBdiDKLuh46984X31bWXqVVN8EemvBEkPwhCIxsQqM/gR5wJ9y
 0DNrhMMR498O1rw05jjCUufmWquuDcl4nVOjUca1OlZI2Ib9Tym93YBcTYKNC5gz
 WwWR7A/6UFNkRBQhzYc2gN7kkdUzb50fMRTq6sOJi5v5dvMZigcWfjnJYYcO0MR3
 1w9nPfKPVcwQ6B4e5xIEZtIspcvvOvSvrcB60ez2gBzWZOTfbtG5CoSkrYr8IM1A
 TJUD79lcQu33WEbmOJKg5twJCLU1m5NSDZiHyhmMLGKdtQRE+j5G3xTVV9saLhl2
 2I9al29mh4gyzjEm/Tg6rAEO477OYrBBNCCOxxKSCg4nqzpp8Gp7DJzSpERQqJZu
 Cm1ZN0LUXvn7rPadWKHhgfUvadleQak7XquuvgkKvLwRk8K9CpRVn0oEhcFLpyJM
 MDpym2WZNt1H4CQ37avhTjhldSNJJkH/ScU4aZ2h2LOiTMQRuDxSz8v2Ug21UbkM
 nlP2QMOAzqfIIbkcSNUOpwefbXIrhnjB6loT+ldVQ+TkGlvkn4UMX8ecXQCZ+u5N
 cE+0oCpA4x2Eo92ZndMBwyNfudTC+4PINPP0gKdWQF4sSqfZuZk=
 =t/Wf
 -----END PGP SIGNATURE-----

Merge tag '1.0.9' into trunk

1.0.9 Macro planning Release
2022-05-23 14:18:53 +02:00
Jérémy Munsch
5973647b07
Update change log V1.0.9 2022-05-23 14:14:00 +02:00
Jérémy Munsch
0ea8234c15
npm update deps 2022-05-23 14:13:09 +02:00
Jérémy Munsch
67e44b6dd9
update composer deps 2022-05-23 14:12:01 +02:00
Vincent BRIDIER
6f78838a4c
Merge branch 'develop' into trunk 2022-05-23 13:09:19 +02:00
Jérémy Munsch
e52d02bf7b
Fix Project markers showing all markers 2022-05-23 10:42:14 +02:00
Jérémy Munsch
5af1101c02
Macro Planning: add link to project label 2022-05-22 13:23:50 +02:00
Jérémy Munsch
ef55965912
Merge branch 'develop' into trunk 2022-05-09 10:38:01 +02:00
Jérémy Munsch
f7f9af4196
Fix migration error on 2020_11_13_152248_create_projects 2022-05-09 10:37:46 +02:00
Jérémy Munsch
926e7ceba1
Merge branch 'develop' into trunk 2022-05-09 10:20:49 +02:00
Jérémy Munsch
f4412728d6
Merge branch 'macroplanning' into develop 2022-05-09 10:11:44 +02:00
Jérémy Munsch
d52edeb6bc
MacroPlanning functionnality
bump kwaadpepper/crud-policies
2022-05-04 17:34:56 +02:00
Jérémy Munsch
76eb069d2e
Composer update deps 2022-04-26 10:33:56 +02:00
Jérémy Munsch
894d7a5d90
Add missing jsconfig + peacock color setting 2022-04-26 09:27:34 +02:00
Olivier Legat
3f0a41f085 Merge branch 'develop' into trunk 2022-04-22 08:02:10 +02:00
Olivier Legat
8af9264826 Squashed commit of the following:
commit 5b014065638d772df7be39a2a7027d1228c91ff3
Author: Alexis Gousseau <alexis.gousseau@ldc.fr>
Date:   Thu Apr 21 15:39:13 2022 +0200

    fix mail spelling error

commit ac2cda98c86ab68a32ebac242b7dc193864c49ab
Author: Alexis Gousseau <alexis.gousseau@ldc.fr>
Date:   Wed Apr 20 15:20:17 2022 +0200

    fix z-index schedule
2022-04-22 08:01:44 +02:00
Vincent BRIDIER
943d0cbeb4
Merge branch 'develop' into trunk 2022-04-20 09:26:13 +02:00
Vincent BRIDIER
44b1c029ac
Merge branch 'frontschedule' into develop 2022-04-20 09:24:39 +02:00
Vincent BRIDIER
8523e6e459
Merge remote-tracking branch 'origin/ticket775' into develop 2022-04-20 09:20:48 +02:00
Alexis Gousseau
11a70825d6 fix front shedule 2022-04-19 12:46:56 +02:00
Alexis Gousseau
894894d66c Ticket 775 : fix tickets count on resetPassword pages 2022-04-19 11:39:27 +02:00
Vincent BRIDIER
9da9eb66d1
Merge branch 'develop' into trunk 2022-04-13 12:32:02 +02:00
S. Hattry
430fd6ef94 Site status required (ticket 749) 2022-04-13 12:21:07 +02:00
Vincent BRIDIER
3d060e2e7f
Merge branch 'develop' into trunk 2022-04-12 16:21:16 +02:00
Vincent BRIDIER
a4d3c09c5d
Merge remote-tracking branch 'origin/ticket775' into develop 2022-04-12 16:09:08 +02:00
Jérémy Munsch
71752f847e
add .vscode to gitignore 2022-04-07 15:11:37 +02:00
Jérémy Munsch
22efb2848a
Fix ticket reopen 2022-04-07 15:06:28 +02:00
Alexis Gousseau
05efc803f8 Ticket 775 : fix tickets count on sites/Projects/User pages 2022-04-05 11:10:12 +02:00
Jérémy Munsch
29e3f640d5
Merge branch 'develop' into trunk 2022-04-01 15:22:06 +02:00
Vincent BRIDIER
ad58d910b4
Merge remote-tracking branch 'origin/ticket774' into develop 2022-04-01 15:19:37 +02:00
Vincent BRIDIER
007932a259
Merge branch 'develop' into trunk 2022-04-01 14:57:01 +02:00
Alexis Gousseau
4575e03295 fix the edition of messages when there are several of them 2022-04-01 09:50:55 +02:00
Vincent BRIDIER
ab2a7ac2b5
Merge branch 'develop' into trunk 2022-03-31 18:32:02 +02:00
Vincent BRIDIER
9b23e33efe
fix ticket show and answer 2022-03-31 18:31:20 +02:00
Olivier Legat
4994f26bda Merge branch 'develop' into trunk 2022-03-31 17:54:49 +02:00
Alexis Gousseau
b7a0a31d28 Ticket 774 : fix buttons layout for better visibility 2022-03-31 16:30:21 +02:00
Vincent BRIDIER
93c08dcf10
Merge remote-tracking branch 'origin/ticket432' into develop 2022-03-30 16:19:06 +02:00
Alexis Gousseau
be6d0ebf1e vscode colors 2022-03-30 14:53:46 +02:00
Alexis Gousseau
386e37eefb add functionality : edit a sent message 2022-03-30 14:53:37 +02:00
Vincent BRIDIER
1e980fab8e
merge ticket 555 2022-03-29 18:18:56 +02:00
Jérémy Munsch
55f22d828a
Ticket 755 : Fix NotifySubscriptions event call 2022-03-29 17:06:31 +02:00
Jérémy Munsch
364a55f7c7
PHPCS update + phpcbf pass 2022-03-29 16:57:54 +02:00
Jérémy Munsch
9ed2a8aecc
Composer update + NPM audit fix and update 2022-03-29 16:55:25 +02:00
Vincent BRIDIER
183e5a98af
Merge branch 'ticket650' into develop 2022-03-28 16:58:16 +02:00
Vincent BRIDIER
bb4dbd1017
Merge branch 'ticket660' into develop 2022-03-28 16:56:22 +02:00
Jérémy Munsch
4b57951701
Fix not handling properly user relation (trashable) 2022-03-25 17:02:13 +01:00
Jérémy Munsch
6227115b6b
Ticket 660: add route ping + JS pinger pour tester la session et afficher une popup si deco + npm update and audit fix 2022-03-22 15:32:49 +01:00
Jérémy Munsch
462082ed28
ticket 650: plainToHtml, use https if app.env !== 'local' 2022-03-22 12:40:35 +01:00