DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
8750 commits 250 branches 1166 tags 78 MiB
Commit graph

8750 commits

This branch
This branch
All branches
Author SHA1 Message Date
clemkeirua
0cfd3e3c1f disable csp 2019-07-01 12:10:08 +02:00
Nicolas Bouilleaud
4ae19898d2
Merge pull request #4018 from betagouv/fix-closed-dossiers-commentaires 
Reallow automatic Commentaires for archived/closed Dossier
 2019-07-01 12:05:54 +02:00
Nicolas Bouilleaud
bd666a53af Reallow automatic Commentaires for archived/closed Dossier 2019-07-01 11:59:29 +02:00
Keirua
d282829ca5
Merge pull request #4017 from betagouv/dev 
2019-07-01-01
 2019-07-01 11:45:24 +02:00
Nicolas Bouilleaud
a238be2f2c
Merge pull request #3987 from betagouv/fix-3986-ROI-Admin 
Fix 3986 roi admin
 2019-07-01 11:31:56 +02:00
Nicolas Bouilleaud
3fee1c7644 Fix UpdateAdministrateurUsageStatisticsJob not being properly scheduled 2019-07-01 11:14:26 +02:00
Chaïb Martinez
e7b868c16f Bug fix 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-01 11:13:36 +02:00
Chaïb Martinez
36114c07a9 Add some test to admin roi calculation 
[fix #3986]

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-01 11:13:36 +02:00
Chaïb Martinez
017f914e21 Add admin roi low and high 
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
 2019-07-01 11:13:36 +02:00
Nicolas Bouilleaud
d70b36a852
Merge pull request #3979 from betagouv/disable-messages-in-archived-dossiers 
Disable Messagerie in archived Dossiers and procedures
 2019-07-01 09:54:21 +02:00
Nicolas Bouilleaud
bd47bf2691 Disable Messagerie in archived Dossiers and procedures 
* Use the existing Dossier#messagerie_available? method
* Raise when attempting to build a Commentaire if not messagerie_available?
* Disable the Messagerie form if not messagerie_available?
* Add tests :)
* Tweak the Horaires formatting while we’re here.
 2019-07-01 09:39:39 +02:00
Keirua
8febe8c21f
Merge pull request #4000 from betagouv/feat/enable-csp-in-prod 
enable csp
 2019-07-01 09:36:34 +02:00
Keirua
65323fad22
Merge branch 'dev' into feat/enable-csp-in-prod 2019-07-01 09:35:26 +02:00
Paul Chavard
c9672cf1b5
Merge pull request #4007 from tchak/avis-api 
Add avis to api
 2019-06-27 15:25:04 +02:00
Paul Chavard
0d80c48b7e Add avis to api 2019-06-27 14:40:17 +02:00
clemkeirua
eaf850c1e9 enable csp 2019-06-27 11:10:29 +02:00
Paul Chavard
1c5b30a42e
Merge pull request #3998 from betagouv/dev 
2019-06-26-01
 2019-06-26 16:29:32 +02:00
LeSim
4d6719fe7c
Merge pull request #3996 from tchak/download-active-storage-files-through-proxy 
Download active_storage blobs through proxy
 2019-06-26 16:08:30 +02:00
Paul Chavard
7f8079b5bb Download active_storage blobs through proxy 2019-06-26 15:32:57 +02:00
Paul Chavard
aad4025ce0 Revert "Download active_storage blobs through proxy" 
This reverts commit 0b39da7080.
 2019-06-26 15:31:35 +02:00
Paul Chavard
0b39da7080 Download active_storage blobs through proxy 2019-06-26 15:07:40 +02:00
Paul Chavard
0adeee51fc
Merge pull request #3997 from betagouv/fix/csp-crisp-websocket 
fix csp rule for crisp websocket
 2019-06-26 14:27:14 +02:00
clemkeirua
f19b5f8911 fix csp rule for crisp websocket 2019-06-26 12:37:55 +02:00
Paul Chavard
030fdfe712
Merge pull request #3994 from betagouv/feat/more-crisp 
enable crisp websockets and css
 2019-06-25 16:48:38 +01:00
Paul Chavard
7a2e9fe8a4
Merge pull request #3990 from betagouv/benjamin-alerte 
Minor text change
 2019-06-25 16:39:38 +01:00
clemkeirua
7064f7e973 enable crisp websockets and css 2019-06-25 17:39:08 +02:00
LeSim
f10e79ab4e
Merge pull request #3992 from tchak/remove-old-comment-pj 
Remove unused code from Commentaire
 2019-06-25 17:28:36 +02:00
Paul Chavard
c5704fa22f Remove unused code from Commentaire 2019-06-25 17:04:29 +02:00
Pierre de La Morinerie
f20739bbe4
2019-06-24-01 (#3989) 
2019-06-24-01
 2019-06-24 17:02:44 +02:00
benjaminhenkel
1200d25f26
Update _list.html.haml 2019-06-24 17:00:10 +02:00
Nicolas Bouilleaud
3d2e6581f3
Merge pull request #3988 from betagouv/fix-pj-migration-notifications 
PJ Migration : ensure creating an empty champ doesn’t display a notification
 2019-06-24 16:55:38 +02:00
Pierre de La Morinerie
50cf6059e6 tasks: ensure creating an empty champ doesn’t display a notification 2019-06-24 15:49:02 +02:00
Keirua
5c2bd46000
Merge pull request #3984 from betagouv/fix-crash-activate_before_expiration 
Fix a crash in the activate_before_expiration email
 2019-06-24 10:39:07 +02:00
Nicolas Bouilleaud
44b9a2ef12 Include application_helper in ApplicationMailer 
fixes a crash in activate_before_expiration.haml (sentry RAILS-40)
 2019-06-21 09:50:33 +02:00
Pierre de La Morinerie
14980c3be1
Remove orphaned piece_justificatives (#3982) 
Suppression des pièces justificatives orphelines en base
 2019-06-20 16:41:31 +02:00
Paul Chavard
0e519679ce Remove orphaned piece_justificatives 2019-06-20 16:28:12 +02:00
Paul Chavard
b468eb8dec
Merge pull request #3980 from tchak/add-order-to-api 
Add order param to API
 2019-06-20 15:40:36 +02:00
Keirua
fda82c71de
Merge pull request #3981 from betagouv/dev 
2019-06-20-01
 2019-06-20 15:35:21 +02:00
Paul Chavard
1781a49932 Add order param to API 2019-06-20 15:28:16 +02:00
Keirua
fc9a241461
Merge pull request #3978 from betagouv/feat/csp-duplicates-rules 
add duplicate rules as fallback
 2019-06-20 11:58:44 +02:00
clemkeirua
d3c6021ef4 add duplicate rules as fallback 2019-06-20 11:34:24 +02:00
Pierre de La Morinerie
53273c5e91 Merge branch 'dev' 
- Usager : correction d'une erreur lors de l'enregistrement simultané d'un champ invalide et d'une pièce jointe
- Admin : correction d'un problème lors de la création d'une démarche sans cadre juridique

- Migration des PJ : gestion des erreurs qui peuvent se produire pendant le rollback
- Migration des PJ : corrige le rollback dans le cas où les dossiers sont cachés
- Correction du mailer_preview pour prendre en compte les administrateurs multiples
 2019-06-20 11:16:34 +02:00
Pierre de La Morinerie
93c3d1bc92
champs: show attachment actions only when the attachment is persisted (#3963) 
Usager : correction d'une erreur lors de l'enregistrement simultané d'un champ invalide et d'une pièce jointe
 2019-06-20 11:10:29 +02:00
Pierre de La Morinerie
9ce92d5c3b champs: show attachment actions only when the atachment is persisted 
Fix #3961
 2019-06-20 11:03:08 +02:00
Pierre de La Morinerie
b98c6e1994
Migration PJ : corrige le rollback dans le cas où les dossiers sont cachés (#3971) 
Migration des PJ : corrige le rollback dans le cas où les dossiers sont cachés
 2019-06-20 10:58:59 +02:00
Pierre de La Morinerie
d561936863 task: ensure that hidden dossiers are rolled back 2019-06-20 10:48:56 +02:00
Nicolas Bouilleaud
d71b3ade80
Merge pull request #3970 from betagouv/fix-pj-migration-rollback 
Migration des PJ : gestion des erreurs qui peuvent se produire pendant le rollback
 2019-06-20 10:42:50 +02:00
Pierre de La Morinerie
f8dda3ae45 tasks: don't abort rollback when a dossier fails 
Instead print a warning, and continue rolling back the other dossiers.
 2019-06-20 10:31:23 +02:00
Pierre de La Morinerie
91393be13c tasks: extract rollback to a separate method 2019-06-20 10:31:23 +02:00
Pierre de La Morinerie
0cfbc75ca9
Mailer preview correction: procedure has now multiple administrators (#3977) 
Correction du mailer_preview pour prendre en compte les administrateurs multiples
 2019-06-20 10:27:46 +02:00