Commit graph

10674 commits

Author SHA1 Message Date
krichtof
c9d886e6b2
Merge pull request #5233 from betagouv/dev
2020-06-04-03
2020-06-04 17:43:51 +02:00
Keirua
af6d31820f
Merge pull request #5232 from betagouv/revert-5228-5207-remove-keystone-v2
Revert "Suppression de l'utilisation de Keystone v2"
2020-06-04 17:34:11 +02:00
krichtof
ff6eaf73db
Revert "Suppression de l'utilisation de Keystone v2" 2020-06-04 17:32:25 +02:00
krichtof
6d463a1707
Merge pull request #5231 from betagouv/dev
2020-06-04-01
2020-06-04 16:27:33 +02:00
krichtof
13cedbf0fd
Merge pull request #5153 from tchak/remove-old-carto
Remove legacy carto
2020-06-04 16:09:36 +02:00
Paul Chavard
901b6e23a8 Remove legacy carto 2020-06-04 16:03:23 +02:00
krichtof
c4c1c971ca
Merge pull request #5230 from betagouv/5226-export-bilans
exporte les bilans aux formats csv, xls et ods
2020-06-04 15:47:20 +02:00
Christophe Robillard
23cc618dda export bilans for avis 2020-06-04 15:31:16 +02:00
Christophe Robillard
cf9d6ccf34 export bilans in ods and xlsx 2020-06-04 15:31:16 +02:00
Paul Chavard
e803276464
Merge pull request #5217 from betagouv/sign_in-headers
#5162 - Meilleurs titres HTML pour écrans sign in/sign up
2020-06-04 15:29:07 +02:00
clemkeirua
f101658d1a add a h1 title to the page 2020-06-04 13:16:44 +00:00
clemkeirua
571875e0f3 replace invalid h3 2020-06-04 13:16:44 +00:00
Paul Chavard
123646c88a
Merge pull request #5215 from betagouv/better-alt-main-title
#5162 - Amélioration des libellés vers l'accueil
2020-06-04 15:15:49 +02:00
clemkeirua
e6efddd886 remove redundant links 2020-06-04 13:02:35 +00:00
clemkeirua
abe0e321ac include the libelle with the redirection link 2020-06-04 13:02:35 +00:00
Keirua
efe7773eb5
Merge pull request #5218 from betagouv/account-labels
#5162 - Précisions sur le format attendu de login et mot de passe
2020-06-04 15:01:45 +02:00
clemkeirua
32dd76dd77 clarification des éléments de création de compte 2020-06-04 12:34:19 +00:00
Keirua
76f9414fd9
Merge pull request #5228 from betagouv/5207-remove-keystone-v2
Suppression de l'utilisation de Keystone v2
2020-06-04 14:33:17 +02:00
clemkeirua
def744d627 remove now useless keystone v2 2020-06-04 12:05:27 +00:00
krichtof
b133b40d6d
Merge pull request #5219 from betagouv/5216-indicateurs-cles-bilans
show some info from bilans
2020-06-04 12:40:56 +02:00
Christophe Robillard
75a268aed6 show some info from bilans 2020-06-04 12:33:33 +02:00
Keirua
3eaeccd668
Merge pull request #5227 from betagouv/dev
2020-06-04-01
2020-06-04 10:08:10 +02:00
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
46b8baf42f
Merge pull request #5209 from betagouv/dev
2020-06-02-01
2020-06-02 14:54: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
fd1e1914b6
Merge pull request #5201 from betagouv/dev
2020-05-28-02
2020-05-28 17:44:19 +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