Commit graph

532 commits

Author SHA1 Message Date
Jérémy Munsch
9fac59ab19
Merge branch 'develop' into trunk 2022-07-01 11:26:16 +02:00
Jérémy Munsch
41d811a24e
Merge branch 'chromefixes' into develop 2022-07-01 11:25:58 +02:00
Jérémy Munsch
3971b4b2fc
Merge branch 'ticket962' into chromefixes
+ Add credit log check client has brands
2022-07-01 11:12:02 +02:00
Jérémy Munsch
97b492b87c
Ticket n° 928 Definitely fix 2022-07-01 11:05:15 +02:00
Jérémy Munsch
259ad1ba18
Ticket n° 957 Fix ticket wording archived condition 2022-07-01 09:27:36 +02:00
Jérémy Munsch
868f4a9dfb
Ticket n° 962 Fix unhandled case user is not admin on accounts 2022-06-30 17:51:15 +02:00
Vincent BRIDIER
77d239f2f0
Merge branch 'develop' into trunk 2022-06-20 14:03:36 +02:00
Jérémy Munsch
64811b9eda
Fix Files.index path 2022-06-20 13:55:47 +02:00
Jérémy Munsch
8dd9aba195
Merge branch 'develop' into trunk 2022-06-17 14:25:27 +02:00
Jérémy Munsch
16dcb72800
Fix composer.lock unmerged 2022-06-17 14:24:34 +02:00
Vincent BRIDIER
8c94f580a9
Merge remote-tracking branch 'origin/ticket925' into develop 2022-06-16 12:07:38 +02:00
Vincent BRIDIER
b0081e82e6
merge ticket928 2022-06-16 12:06:03 +02:00
Vincent BRIDIER
56aa2b2a2c
Merge remote-tracking branch 'origin/ticket930' into develop 2022-06-16 12:02:50 +02:00
Vincent BRIDIER
1f8199b230
Merge remote-tracking branch 'origin/ticket933' into develop 2022-06-16 12:01:23 +02:00
Jérémy Munsch
296ebc62fe
add ticket link on credit logs 2022-06-15 18:52:24 +02:00
Jérémy Munsch
ba87af1327
Ticket 928
- add related model in accounts.index and creadit_logs.index
- Filter only current credit_logs of the related account in credit_logs.index
2022-06-15 18:40:52 +02:00
Jérémy Munsch
a178d2e891
Autoriser un multiple de 0.125 sur estimation de ticket 2022-06-15 18:26:16 +02:00
Jérémy Munsch
abcee7b301
Enhance visual tickets display 2022-06-15 18:07:44 +02:00
Jérémy Munsch
95a01f80b8
Ticket 930 fix files.create 2022-06-15 17:26:53 +02:00
Jérémy Munsch
2d077f5d46
Fix sites.add 2022-06-15 17:21:12 +02:00
Jérémy Munsch
9dc1e00f6f
Ticket 936 fix plannings view title z-index 2022-06-15 16:43:41 +02:00
Jérémy Munsch
ab7d676d21
Merge branch 'develop' into trunk 2022-06-14 16:11:33 +02:00
Jérémy Munsch
b3c87ac735
bump and kwaadpepper/exception-handler and update 2022-06-14 16:11:15 +02:00
Jérémy Munsch
77afd066a1
Fix manifest-src 2022-06-14 16:06:24 +02:00
Jérémy Munsch
5a6b41e4f2
Merge branch 'develop' into trunk 2022-06-14 09:28:50 +02:00
Jérémy Munsch
7baccfc26f
Remove forgotten Label::createDefaultLabelsFor call on Site event 2022-06-14 09:28:16 +02:00
Jérémy Munsch
b759a04fdb
Vue extract styles + CSP enforce 2022-06-10 10:14:40 +02:00
Jérémy Munsch
8ec8c16cd5
Merge branch 'develop' into trunk 2022-06-09 18:53:03 +02:00
Jérémy Munsch
d885ee2f3d
Merge branch 'hotfix' into develop 2022-06-09 18:52:53 +02:00
Jérémy Munsch
b13059715d
Revert to unsafe inline force by vuejs style loader
https://github.com/vuejs/vue-style-loader/issues/33
2022-06-09 18:51:40 +02:00
Jérémy Munsch
2d141d74ed
Fix CSP CKeditor directives missing semi colon 2022-06-09 18:32:35 +02:00
Jérémy Munsch
ead885799f
Merge branch 'trunk' 2022-06-09 18:26:29 +02:00
Jérémy Munsch
63b619909e
Merge branch 'develop' into trunk 2022-06-09 18:25:44 +02:00
Jérémy Munsch
93724329ff
bump version to 1.2.1 2022-06-09 18:23:19 +02:00
Jérémy Munsch
ec3d0ca044
Remove the need of css unsafe-inline 2022-06-09 18:23:18 +02:00
Olivier Legat
aec2bd8f50 Merge branch 'develop' into trunk 2022-06-09 16:59:02 +02:00
Olivier Legat
9bc9b459b2 Merge branch 'hotfix' into develop 2022-06-09 16:58:40 +02:00
Olivier Legat
959c102a68 Merge branch 'hotfix' 2022-06-09 16:58:14 +02:00
Olivier Legat
2f87824f44
fix regression on tmpPass 2022-06-09 16:57:24 +02:00
Jérémy Munsch
fc4450922a
Merge branch 'hotfix' 2022-06-09 13:48:44 +02:00
Jérémy Munsch
35111a9d5b
Merge branch 'develop' into trunk 2022-06-09 13:47:00 +02:00
Jérémy Munsch
840701e27a
Merge branch 'hotfix' into develop 2022-06-09 13:45:59 +02:00
Jérémy Munsch
9c1b540703
FIX CSP issues
- bumped crud-policies to 0.4.2
- compile vue using runtime and production mode
2022-06-09 13:37:13 +02:00
Jérémy Munsch
f3a20682f0
Fixed new ticket 2022-06-09 12:11:27 +02:00
Jérémy Munsch
79f9b67d3e
Force scheme https always 2022-06-09 12:03:49 +02:00
Olivier Legat
6bf066b4dd Merge branch 'master' of https://voight001.lesidc.com/supportweb 2022-06-09 10:29:42 +02:00
Olivier Legat
cd0cbd45aa Merge branch 'trunk' 2022-06-09 10:29:02 +02:00
Jérémy Munsch
033175bb1d
Merge branch 'develop' into trunk 2022-06-08 09:24:39 +02:00
Jérémy Munsch
134e353a39
Hotfix remove Acount association from brands.create and edit 2022-06-08 09:24:08 +02:00
Jérémy Munsch
347bf77d43
Merge branch 'develop' into trunk 2022-06-08 08:58:10 +02:00