Commit graph

524 commits

Author SHA1 Message Date
Vincent BRIDIER
488f3e7ea2
Merge branch 'trunk' 2022-04-01 14:57:26 +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
3a866c0a97
Merge branch 'trunk' 2022-03-31 18:32:20 +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
318d52f718 Merge branch 'trunk' 2022-03-31 17:55:14 +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
Olivier Legat
3c770e173c Merge branch 'trunk' 2022-03-15 17:36:00 +01:00
Olivier Legat
c31695bc46 Merge branch 'develop' into trunk 2022-03-15 17:35:47 +01:00
Olivier Legat
74aebc4010 do not clear clipboard after paste in planning 2022-03-15 17:35:33 +01:00
Olivier Legat
d249acde6f remove front end old plannings elements 2022-03-15 16:58:14 +01:00
Olivier Legat
812b44636a remove old plannings code 2022-03-15 16:50:25 +01:00
Olivier Legat
24393d6f4e Merge commit '041bde8ea601979ce9d82348b0bb8d766249d852' into develop 2022-03-15 16:29:18 +01:00
S. Hattry
041bde8ea6 ticket 528 - Archived ticket display bug 2022-03-09 10:08:24 +01:00
Olivier Legat
c59c97c1b0 Merge branch 'trunk' 2022-03-08 12:11:40 +01:00
Olivier Legat
c790fdf63d Merge branch 'develop' into trunk 2022-03-08 12:11:28 +01:00
Olivier Legat
a0e6b02561 min 3 chars in desc
fill missing slots up to config dayslots
2022-03-08 12:11:18 +01:00
Olivier Legat
89d4868fb4 Merge branch 'trunk' 2022-03-08 11:53:38 +01:00
Olivier Legat
3a88eefe63 Merge branch 'develop' into trunk 2022-03-08 11:53:22 +01:00
Olivier Legat
8088b6bde3 adjust enum for 8 slots 2022-03-08 11:47:34 +01:00
Olivier Legat
3480a97af2 Merge branch 'trunk' 2022-03-08 11:45:28 +01:00
Olivier Legat
159960801f Merge branch 'develop' into trunk 2022-03-08 11:45:18 +01:00
Olivier Legat
0abc8c2c38 adjust enum for 8 slots 2022-03-08 11:45:03 +01:00
Olivier Legat
95a0615d29 Merge branch 'trunk' 2022-03-08 11:39:35 +01:00
Olivier Legat
759ba1c6d2 Merge branch 'develop' into trunk 2022-03-08 11:39:22 +01:00
Olivier Legat
cf57486a83 Merge branch '8slotsperday' into develop 2022-03-08 11:39:06 +01:00
Olivier Legat
14410b3c02 passage à 8 slots par jour
modification d'interface pour visualisation
2022-03-08 11:38:07 +01:00
Vincent BRIDIER
270d0c1904 Merge branch 'trunk' 2022-02-23 15:43:29 +00:00
Vincent BRIDIER
8f5def1a8e Merge branch 'develop' into trunk 2022-02-23 15:42:24 +00:00
Vincent BRIDIER
dbc5da9aff - Fix view share 2022-02-23 15:41:47 +00:00
Vincent BRIDIER
1b0e9e3959 Merge branch 'trunk' 2022-02-23 15:29:33 +00:00
Vincent BRIDIER
58d27aafd4 Merge branch 'develop' into trunk 2022-02-23 15:29:08 +00:00
Vincent BRIDIER
d7b6e71bca - Fix Controller global 2022-02-23 15:28:31 +00:00
Vincent BRIDIER
1c205d0b92 Merge branch 'trunk' 2022-02-23 15:17:21 +00:00
Vincent BRIDIER
35a565cd8f Merge branch 'develop' into trunk 2022-02-23 15:16:46 +00:00
Vincent BRIDIER
7d409d35da - Add internal tickets flag
- Move view share with Internal status
 - Update .env.example
2022-02-23 15:15:47 +00:00