LeSim
003c0c28ad
Merge pull request #4235 from betagouv/fix-4234-crisp-admin-help-iframe
...
Add crips help domaine to defaut policy src
2019-08-27 10:40:52 +02:00
Chaïb Martinez
f2386a5800
Add crips help domaine to defaut policy src
...
[fix #4234 ]
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-08-27 10:30:10 +02:00
LeSim
3b77e4188c
Merge pull request #4237 from betagouv/dependabot/npm_and_yarn/eslint-utils-1.4.2
...
Bump eslint-utils from 1.3.1 to 1.4.2
2019-08-27 10:26:09 +02:00
dependabot[bot]
88f8786a1d
Bump eslint-utils from 1.3.1 to 1.4.2
...
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils ) from 1.3.1 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases )
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
2019-08-26 21:57:58 +00:00
Paul Chavard
b233ea6e52
Merge pull request #4230 from tchak/fix-procedure-logo-migration-task
...
Fix and test migrate_procedure_logo task
2019-08-22 12:30:12 +02:00
Paul Chavard
d02e0fc556
Fix and test migrate_procedure_logo task
2019-08-22 11:28:03 +02:00
Paul Chavard
5cc3a9eb60
Merge pull request #4229 from betagouv/fix_capybara_on_sims_desktop
...
Fix capybara on linux ubuntu
2019-08-22 11:13:36 +02:00
simon lehericey
fc7ce3fe61
Fix capybara on linux ubuntu
...
Otherwise, it appears fullscreen
2019-08-21 17:38:54 +02:00
LeSim
9db23dc590
Merge pull request #4216 from tchak/migrate-procedure-logo
...
Migrate procedure logo to active_storage
2019-08-21 16:56:48 +02:00
Paul Chavard
cc35a04e26
Migrate procedure logo to active_storage
2019-08-21 11:15:00 +02:00
LeSim
ce97b8c359
Merge pull request #4226 from tchak/fix-carto
...
Fix carte initialize
2019-08-21 10:59:56 +02:00
Paul Chavard
6215ccb3d7
Fix carte initialize
2019-08-21 10:48:49 +02:00
Paul Chavard
10a859cedf
Merge pull request #4222 from tchak/improve-procedure-clone-attachements
...
Improve clone of procedure attachements
2019-08-21 08:19:30 +02:00
Paul Chavard
b7b46e9a82
Improve clone of procedure attachements
2019-08-20 17:30:44 +02:00
LeSim
cf6c33b9b5
Merge pull request #4224 from betagouv/fix_flaky_spec
...
fix flaky spec in ip_service_spec
2019-08-20 16:48:09 +02:00
simon lehericey
eb2ebee16e
fix flaky spec in ip_service_spec
2019-08-20 16:41:32 +02:00
LeSim
3330b9550f
Merge pull request #4220 from betagouv/update_nokogiri
...
Mise à jour de la Gem Nokogiri
2019-08-20 15:02:21 +02:00
LeSim
9f481e3a4d
Merge pull request #4218 from betagouv/fix_after_party_task
...
Corrige une tache after party
2019-08-20 14:44:02 +02:00
simon lehericey
69c1734b3e
bump nokogiri
2019-08-20 14:40:14 +02:00
simon lehericey
bf3dd319c1
Task: catch various exception
2019-08-20 14:37:35 +02:00
LeSim
9ba3de65de
Merge pull request #4205 from betagouv/remove-old-after-parties
...
Remove nonworking after_party rake tasks
2019-08-20 14:06:15 +02:00
Nicolas Bouilleaud
e27fbf1a95
Remove nonworking after_party rake tasks
...
These tasks mention symbols that have been renamed or removed. (Gestionnaire, Procedure.administrateur (single), or VirusScan.)
They won’t be run again.
I guess some (most) of the other after_party and rake tasks could be removed too; it’s just that those prevent `rake after_party:run` to execute on a clean install.
2019-08-20 14:01:38 +02:00
LeSim
28656cbad7
Merge pull request #4212 from philemon95/patch-3
...
retrait d'un s
2019-08-20 14:00:15 +02:00
Philémon
0528026631
retrait d'un s
...
par souci de cohérence entre "satisfaction usagerø" et "contact usagerø" :)
la bise!
2019-08-20 13:53:24 +02:00
Philémon
e6e0f5ed31
changement de wording
...
changement de wording "Connectez-vous pour donner votre avis" > "Cliquez ici pour donner votre avis", ça permet de clarifier (sinon les usagers peuvent penser que c'est le lien pour se connecter à ds (/sign_in).
c'est le fruit de discussion avec des admin :)
2019-08-20 13:53:24 +02:00
LeSim
3a1f17cce8
Merge pull request #4033 from pengfeidong/lock_account_by_brute_force_attack_use_rack_attack
...
add Gem rack_attack for prevent attack brute-force
2019-08-20 13:45:01 +02:00
simon lehericey
86d968bb8e
Use rack_attack_enabled?
...
We cannot enable rack attack during the tests as it interferes with features spec.
So we add a flag to enable it during the runtime.
2019-08-20 13:29:29 +02:00
simon lehericey
0f0fecdb25
RackAttack: use remote ip and test it !
2019-08-20 13:29:29 +02:00
simon lehericey
b7f8bb2fea
Simplify ip_service
2019-08-20 13:29:29 +02:00
pedong
fc8cebd78d
add Gem rack_attack for prevent attack brute-force
2019-08-20 13:29:29 +02:00
LeSim
cab5b5cd9b
Merge pull request #4211 from betagouv/simplify_role_creation
...
Simplifie la création de role instructeur ou administrateur
2019-08-20 12:25:06 +02:00
simon lehericey
e0e29d741f
Simplify instructeur and administrateur factory
2019-08-20 12:20:12 +02:00
simon lehericey
c1a622efa1
Add User.create_or_promote_to_administrateur
2019-08-20 12:20:12 +02:00
simon lehericey
01a91e68ca
Simply avis controller
2019-08-20 12:20:12 +02:00
simon lehericey
98a24bea51
Simplify invite_instructeur
2019-08-20 12:20:12 +02:00
simon lehericey
97d0855d47
add User.create_or_promote_to_instructeur
2019-08-20 12:20:12 +02:00
LeSim
132900cca2
Merge pull request #4213 from betagouv/fix_manager_reset_password
...
Corriger un bug dans le manager concernant le reset de password
2019-08-20 12:17:37 +02:00
simon lehericey
e913b01c52
fix_manager_reset_password
2019-08-20 12:12:20 +02:00
LeSim
a455836498
Merge pull request #4214 from betagouv/fix_manager_delete_admin
...
Corrige la suppression d'un administrateur par une administration
2019-08-20 12:07:50 +02:00
simon lehericey
ebe871819d
Fix admin deletion by an administration
2019-08-20 12:01:36 +02:00
LeSim
6e83f3d524
Merge pull request #4215 from betagouv/fix_procedure_presentation
...
Corrige un bug dans le filtre de la vue instructeur
2019-08-20 11:33:33 +02:00
simon lehericey
77c11d8b79
fix_procedure_presentation
2019-08-20 11:28:18 +02:00
Paul Chavard
19bf1bebaf
Merge pull request #4203 from tchak/remove-commentaire-file-uploader
...
Remove commentaire file uploader
2019-08-20 10:29:42 +02:00
Paul Chavard
e9ba7700d4
Remove commentaire file uploader
2019-08-20 10:24:13 +02:00
Paul Chavard
522d45839b
Merge pull request #4209 from betagouv/cleaning
...
Cleaning
2019-08-20 10:23:50 +02:00
Paul Chavard
78b0650ef0
Merge pull request #4210 from betagouv/cleaning_user_session
...
Nettoyage du Controller de Session
2019-08-20 10:17:43 +02:00
simon lehericey
80cb8b87fe
Keep only the FC logic and use devise for the rest
2019-08-16 16:48:22 +02:00
simon lehericey
54d7effe28
Spec: specify france_connect logic
2019-08-16 16:48:22 +02:00
simon lehericey
9c715b2969
SessionController: new User in view
2019-08-16 16:48:22 +02:00
simon lehericey
416a07d2dd
SessionView: simplify
2019-08-16 16:48:22 +02:00
