Vincent BRIDIER
|
4824d9ee18
|
Merge branch 'trunk'
|
2022-05-23 13:09:57 +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
|
9915f2b5d5
|
Merge branch 'trunk'
|
2022-04-22 08:02:30 +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
|
325377f970
|
Merge branch 'trunk'
|
2022-04-20 09:26:27 +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
|
be7e5e7501
|
Merge branch 'trunk'
|
2022-04-13 12:32:20 +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
|
8e6eb79a00
|
Merge branch 'trunk'
|
2022-04-12 16:21:40 +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
|
85ade15303
|
Merge branch 'trunk'
|
2022-04-01 15:22:35 +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
|
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 |
|