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

9836 commits

This branch
This branch
All branches
Author SHA1 Message Date
Keirua
94862340f7
Merge pull request #5225 from betagouv/5224-fix-effectifs 
ask effectifs only for 2020/02
 2020-06-04 09:30:27 +02:00
Christophe Robillard
6535324ae9 ask effectifs only for 2020/02 2020-06-04 09:18:01 +02:00
krichtof
5f200ecdfb
Merge pull request #5214 from betagouv/5123-ordre-bilans 
reorder bilans bdf csv
 2020-06-03 17:05:55 +02:00
Christophe Robillard
d06867822b reorder bilans bdf csv 2020-06-03 15:45:11 +02:00
krichtof
343dbe111c
Merge pull request #5212 from betagouv/define_max_attempts_for_jobs 
define max_attempts for jobs
 2020-06-03 15:44:23 +02:00
Christophe Robillard
705487dab6 define max_attempts for jobs 2020-06-02 20:21:11 +02:00
Keirua
95f925f5f7
Merge pull request #5210 from betagouv/5207-add-keystone-v3 
#5207 - Add overide for fog openstack v3
 2020-06-02 15:17:24 +02:00
clemkeirua
868decd06e add overide for fog openstack v3 2020-06-02 15:03:37 +02:00
Kara Diaby
946c564f59
Merge pull request #5205 from betagouv/feat/5195 
feat/5195 - Add 2 cards style for MapEditor + optim import gpx kml
 2020-06-02 14:16:02 +02:00
kara Diaby
f104567619 Add 2 cards style for MapEditor + optim import gpx kml 2020-06-02 13:24:29 +02:00
Pierre de La Morinerie
26f729abdd
Merge pull request #5206 from betagouv/dependabot/bundler/puma-3.12.6 
build(deps): bump puma from 3.12.4 to 3.12.6
 2020-06-02 12:12:09 +02:00
dependabot[bot]
fbf2cef36d
build(deps): bump puma from 3.12.4 to 3.12.6 
Bumps [puma](https://github.com/puma/puma) from 3.12.4 to 3.12.6.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-02 09:57:49 +00:00
Pierre de La Morinerie
580f5c7558
Merge pull request #5208 from betagouv/numerique-gouv-fr 
views: modernisation.gouv.fr -> numerique.gouv.fr
 2020-06-02 11:56:31 +02:00
Pierre de La Morinerie
ab54b8a45e views: modernisation.gouv.fr -> numerique.gouv.fr 
Fix #4161
 2020-06-02 11:40:59 +02:00
Keirua
3fcbc2a0bd
Merge pull request #5203 from betagouv/dependabot/bundler/kaminari-1.2.1 
build(deps): bump kaminari from 1.1.1 to 1.2.1
 2020-06-02 10:29:52 +02:00
dependabot[bot]
dc9769c38c build(deps): bump kaminari from 1.1.1 to 1.2.1 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.1.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-02 07:59:16 +00:00
Kara Diaby
8d55ad3104
Merge pull request #5202 from betagouv/feat/5195-2 
feat/5195 - Add styles without cadastres in  mapReader + tutorials pages
 2020-05-29 09:36:34 +02:00
kara Diaby
1e3a042a69 Add styles without cadastres in mapReader + tutorials pages in MapEditor 2020-05-28 17:50:14 +02:00
krichtof
838ebfe2f1
Merge pull request #5199 from tchak/fix-etablissements-dossier 
Fix remaining etablissements with shared dossier
 2020-05-28 17:40:32 +02:00
Paul Chavard
cbe7249b67 Fix remaining etablissements with shared dossier 2020-05-28 16:54:58 +02:00
Pierre de La Morinerie
4048834b32
Merge pull request #5200 from betagouv/update-rebase-action 
Mise à jour de l'action GitHub "Rebase"
 2020-05-28 16:02:34 +02:00
Pierre de La Morinerie
44765e362b github: fix trailing whitespace 2020-05-28 13:53:01 +00:00
Pierre de La Morinerie
cfb66490d3 github: update rebase action 
Update from 1.2 to 1.3.1:

- Allows to rebase PRs on forks (as long as the submitter checked "allow edits from maintainers").
- Less workarounds
 2020-05-28 13:53:01 +00:00
Pierre de La Morinerie
cd234791cf
Merge pull request #5194 from betagouv/heure-de-paris 
Usager : affichage de la date limite des démarches dans la description et les emails
 2020-05-28 15:34:25 +02:00
Judith
d930124839 change procedure_auto_archive helper name and added a helper for 23 h 59 2020-05-28 13:22:02 +00:00
Judith
6b65ee8d15 mailers: display auto-archive date in notifications 2020-05-28 13:22:02 +00:00
Judith
38eb60f2ac views: display auto-archive date on procedure description 2020-05-28 13:22:02 +00:00
Judith
59346ee868 mailers: mention the auto_archive in notify_new_draft 2020-05-28 13:22:02 +00:00
Judith
e73086ee4c views: added the precision of the time zone for auto_archive 
fix #5181
 2020-05-28 13:22:02 +00:00
Christophe Robillard
a923215139 fix fix champ etablissement 2020-05-27 18:46:04 +02:00
krichtof
1e8827500b
Merge pull request #5196 from betagouv/fix-champ-etablissement 
fix champ etablissement
 2020-05-27 18:14:28 +02:00
Christophe Robillard
35458761da fix champ etablissement 2020-05-27 18:04:56 +02:00
Paul Chavard
8c5fd58bd1
Merge pull request #5099 from tchak/fix-draft-notofications 
Do not send draft norifications to users on inactive démarches
 2020-05-27 17:23:29 +02:00
Paul Chavard
20705d6e30 Do not send draft norifications to users on inactive démarches 2020-05-27 16:36:46 +02:00
krichtof
e3b6a33d89
Merge pull request #5191 from betagouv/bugfix-champ-siret 
Fix. Ne met plus à jour l'établissement du dossier lors de la modif d'un champ siret
 2020-05-26 18:26:32 +02:00
Christophe Robillard
fb87a09c02 doesn't update dossier etablissement for siret controller 2020-05-26 18:13:20 +02:00
Keirua
b8093962ec
Merge pull request #5185 from betagouv/aide-probleme-mail 
Ajout de precisions pour les emails non reçus lors de la création de compte
 2020-05-26 16:48:27 +02:00
clemkeirua
87f1e63e1b ajout de precisions pour les emails non reçus 2020-05-26 15:46:51 +02:00
Keirua
08f21c3bd6
Merge pull request #5186 from betagouv/service-must-be-reachable 
Précisions sur le caractère obligatoire des infos de service
 2020-05-26 15:46:33 +02:00
Keirua
0727f99ac8
reformulation d'un libelle de l'editeur de services 
Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>
 2020-05-26 15:28:27 +02:00
clemkeirua
21ad7055a2 precisions sur le caractère obligatoire des infos de service 2020-05-25 15:47:02 +02:00
Pierre de La Morinerie
2b644eb042
Merge pull request #5183 from betagouv/fix-spring-pg-crash 
Correction de crashes lors de l'utilisation de Spring
 2020-05-25 11:45:39 +02:00
Pierre de La Morinerie
b0db74ea79 config: fix spring randomly crashing in the pg gem 
See https://github.com/ged/ruby-pg/issues/311
 2020-05-25 09:23:41 +00:00
Keirua
1adb197e96
Merge pull request #5184 from betagouv/remove-unused-spec 
specs: remove unused test case
 2020-05-25 09:10:30 +02:00
Pierre de La Morinerie
2f509c2536 specs: remove unused test case 
Actual code was removed in 0ff6c793ae

The spec was never executed, because it lacked the `_spec.rb` suffix.
 2020-05-20 17:45:06 +02:00
Keirua
af6731578a
Merge pull request #5182 from betagouv/5113-async-for-api-ent-calls 
raise exception with url
 2020-05-20 16:11:40 +02:00
Christophe Robillard
1b509c15f8 raise exception with url 2020-05-20 15:53:08 +02:00
Pierre de La Morinerie
8f283d1383
Merge pull request #5164 from betagouv/feat/5136 
Usager : amélioration de l'interface d'import de données cartographiques
 2020-05-20 14:28:31 +02:00
kara Diaby
d8ae089e93 [Carto] Improve files import UX + import KML files 2020-05-20 14:17:27 +02:00
krichtof
7c6d870925
Merge pull request #5176 from betagouv/5113-async-for-api-ent-calls 
Passe la récupération des données API Entreprise en asynchrone
 2020-05-20 11:22:12 +02:00