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

17182 commits

This branch
This branch
All branches
Author SHA1 Message Date
lydiasan
42153d1d37 ajout du selecteur de langue 2021-05-12 16:30:35 +02:00
Paul Chavard
9e1985d721
Merge pull request #6205 from betagouv/main 
2021-05-11-02
 2021-05-11 18:01:13 +02:00
Paul Chavard
61f49619ba
Merge pull request #6204 from tchak/fix_nullable_user 
Dossier without user should be valid
 2021-05-11 17:59:54 +02:00
Paul Chavard
3f7a2bea9b Dossier without user should be valid 2021-05-11 17:50:10 +02:00
Paul Chavard
c38bfedb80
Merge pull request #6182 from tchak/add_brouillon_extend_conservation_column_part_2 
Rename en_construction_conservation_extension to conservation_extension – part 2
 2021-05-11 17:42:49 +02:00
Paul Chavard
8a74438dc1 Use conservation_extension instead of en_construction_conservation_extension 2021-05-11 17:33:53 +02:00
Paul Chavard
3d40039182
Merge pull request #6202 from betagouv/main 
2021-05-11-01
 2021-05-11 16:48:55 +02:00
Paul Chavard
109e5e74b2 Use interval string representation 2021-05-11 15:29:41 +02:00
Paul Chavard
58a90eb4a6 fix update_all query 2021-05-11 14:53:41 +02:00
Paul Chavard
a5d217aec2
Merge pull request #6175 from tchak/add_brouillon_extend_conservation_column 
Rename en_construction_conservation_extension to conservation_extension
 2021-05-11 14:17:47 +02:00
Paul Chavard
4a874a282c Add progress report 2021-05-11 14:08:51 +02:00
Paul Chavard
d0fe78351e Update lib/tasks/deployment/20210429172327_rename_conservation_extension.rake 
Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>
 2021-05-11 14:08:51 +02:00
Paul Chavard
e1b3ea122c Update lib/tasks/deployment/20210429172327_rename_conservation_extension.rake 
Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>
 2021-05-11 14:08:51 +02:00
Paul Chavard
1e0d6ea28f Rename en_construction_conservation_extension to conservation_extension 2021-05-11 14:08:51 +02:00
Pierre de La Morinerie
298718936f
Merge pull request #6189 from betagouv/dependabot/npm_and_yarn/lodash-4.17.21 
Mise à jour de la dépendance Javascript `lodash` de 4.17.19 à 4.17.21
 2021-05-11 13:38:34 +02:00
dependabot[bot]
5a1da2d4e9
Bump lodash from 4.17.19 to 4.17.21 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-11 11:30:06 +00:00
Pierre de La Morinerie
aac7f49ce6
Merge pull request #6190 from betagouv/dependabot/npm_and_yarn/hosted-git-info-2.8.9 
Mise à jour de la dépendance Javascript `hosted-git-info` de la version 2.8.8 à 2.8.9
 2021-05-11 13:01:56 +02:00
dependabot[bot]
166d6210d6
Bump hosted-git-info from 2.8.8 to 2.8.9 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-11 10:52:18 +00:00
Pierre de La Morinerie
06e607817d
Merge pull request #6186 from betagouv/dependabot/npm_and_yarn/url-parse-1.5.1 
Mise à jour de la dépendance Javascript `url-parse` de 1.4.7 à 1.5.1
 2021-05-11 12:38:54 +02:00
dependabot[bot]
5b18eef232
Bump url-parse from 1.4.7 to 1.5.1 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-11 10:30:57 +00:00
LeSim
7130e75913
Merge pull request #6193 from betagouv/main 
2021-05-10-01
 2021-05-10 12:12:55 +02:00
LeSim
93104d4782
Merge pull request #6192 from betagouv/fix_dossier_state_spreadsheet_export 
corrige une traduction manquante pour l'état d'un dossier dans les exports csv/excel ...
 2021-05-10 11:28:55 +02:00
simon lehericey
c5f6c9ae1e fix missing state translation 2021-05-10 11:17:34 +02:00
LeSim
c639268e74
Merge pull request #6188 from adullact/6187_fix_spec_api-entreprise_exercices-job 
#6187 - Fix(API Entreprise): test fails randomly
 2021-05-10 11:17:01 +02:00
François Vantomme
99ce5195bc Fix (API Entreprise): test fails randomly 
Don't assume array order, just check that all values are present
 2021-05-07 17:42:15 +02:00
LeSim
03acf89fa7
Merge pull request #6185 from betagouv/main 
2021-05-07-01
 2021-05-07 12:10:23 +02:00
LeSim
656068e53f
Merge pull request #6184 from betagouv/bump_administrate 
update administrate
 2021-05-07 11:25:39 +02:00
simon lehericey
19aefa1fd0 update administrate 2021-05-07 11:15:22 +02:00
Paul Chavard
611afa2014
Merge pull request #6181 from tchak/fix-smtp-config 
Use explicit name to avoid unknown constant errors
 2021-05-06 16:31:54 +02:00
Paul Chavard
e8cdded515 Use explicit name to avoid unknown constant errors 2021-05-06 16:10:48 +02:00
Pierre de La Morinerie
65a280660d
Merge pull request #6177 from betagouv/remove-older-after-party-tasks 
Suppression des tâches de déploiement `after_party` les plus anciennes (#6177)
 2021-05-06 15:28:05 +02:00
Pierre de La Morinerie
77b65f3aa0 tasks: remove older after_party tasks 2021-05-06 15:19:37 +02:00
Pierre de La Morinerie
9fd42a809f
Merge pull request #6180 from betagouv/fix-administrate-translation 
SuperAdmin : correction de l'affichage de la page `/manager/dossiers`
 2021-05-06 15:18:52 +02:00
Pierre de La Morinerie
b398485d97 manager: localize dossier enums 
In the previous commit, we cleaned up the localization of the
Dossier.state enum. This prevented administrate from crashing, but now
the dossier enum are no longer localized in the Manager.

By using a `Field::Enum` type, we instruct the administrate plugin
to look up our localized name for the Dossier state enum.
 2021-05-06 14:41:08 +02:00
Pierre de La Morinerie
b8f71bd52c i18n: fix enum values for Dossier.state 
According to Rails i18n guide, enum values should be localized
as `<model>/<enum>`, not as sub-values to the attribute.

This fixes an exception in administrate when displaying a Dossier
in the Manager.

Note: we need to change the way GraphQL attributes are generated, because
`AASM::Core::State#display_name` doesn’t honor the `model/attribute.value`
convention (and instead tries to localize as `model.attribute/value`).
So instead we lookup the localized name using ActiveRecord.
 2021-05-06 14:38:25 +02:00
Pierre de La Morinerie
752401a18a
Merge pull request #6179 from betagouv/main 
2021-05-06-01
 2021-05-06 11:40:02 +02:00
Pierre de La Morinerie
fb75f9d133
Merge pull request #6178 from betagouv/fix-manager 
SuperAdmin : réparation du manager après la mise à jour à Rails 6.1.3.2 (#6178)
 2021-05-06 11:28:34 +02:00
Pierre de La Morinerie
ce6a27d416 manager: upgrade administrate to be compatible with Rails 6.1.3.2 
Rails 6.1.3.2 is a security upgrade, and we had to upgrade quickly.
Unfortunately that broke the administrate gem.

A PR has been opened to fix the issues with the newest Rails version,
and will probably be merged quickly. Meanwhile we can fix the manager
by using the version from the PR for now.

Once the PR is merged and a new version of administrate is released,
we can use a released version of administrate again.
 2021-05-06 11:17:17 +02:00
Pierre de La Morinerie
dc33f4a395 manager: use administrate helper to retrieve resource path 
This is lifted from the current default template provided by
administrate.
 2021-05-06 11:11:04 +02:00
krichtof
b39b43179d
Merge pull request #6171 from betagouv/6132-fix-broken-link 
corrige le lien annuaire lorsque le siren n'est pas connu
 2021-05-06 10:07:32 +02:00
Christophe Robillard
6086f05524 corrige le lien annuaire lorsque le siren n'est pas connu 2021-05-06 09:59:27 +02:00
Pierre de La Morinerie
225fadbdf8
Merge pull request #6135 from betagouv/small_style_fixes 
Instructeur : petites améliorations de l'interface du tableau de bord d'une démarche (#6135)
 2021-05-06 09:22:13 +02:00
simon lehericey
55b80df29d display count before text in tabs 2021-05-06 09:13:20 +02:00
simon lehericey
f55c6ee371 stick arrow with label 2021-05-06 09:13:20 +02:00
Paul Chavard
924ce114f4
Merge pull request #6164 from tchak/custom-smtp 
Use HELO (custom dev SMTP)
 2021-05-06 09:07:44 +02:00
Paul Chavard
327bec0637 Use HELO 2021-05-06 08:59:18 +02:00
LeSim
1bcc52cab4
Merge pull request #6176 from betagouv/main 
2021-05-05-02
 2021-05-05 21:46:35 +02:00
LeSim
a261801a41
Merge pull request #6174 from betagouv/update_rails 
go to rails 6.1.3.2
 2021-05-05 21:45:03 +02:00
simon lehericey
5124e08ccd disable faulty manager spec 2021-05-05 21:34:57 +02:00
simon lehericey
6dd3dd24a4 go to rails 6.1.3.2 2021-05-05 20:54:36 +02:00