Commit graph

19585 commits

Author SHA1 Message Date
gregoirenovel
0b1a143419 Merge branch 'dev' 2018-10-02 14:03:42 +02:00
Pierre de La Morinerie
c50ad6da3a
Merge pull request #2723 from betagouv/dossier-details-remove-feature-flag
[Dossier] Suppression du feature-flag
2018-10-02 12:32:54 +02:00
Pierre de La Morinerie
758ccff984 dossier: remove feature flag 2018-10-02 12:25:44 +02:00
Pierre de La Morinerie
f007eaa2ee dossier: enable new UI by default 2018-10-02 12:23:53 +02:00
Pierre de La Morinerie
1cf316017f
Merge pull request #2708 from betagouv/fix-2707
Ajout d'une astuce dans l'ajout d'instructeur
2018-10-02 11:50:44 +02:00
Chaïb Martinez
da134c6d4b Ajout d'une astuce dans l'ajout d'instructeur 2018-10-02 11:43:44 +02:00
gregoirenovel
cc2294918d
Merge pull request #2727 from betagouv/fix-destroy
Fix scope for logo/notice/deliberation deletion
2018-10-02 11:14:27 +02:00
gregoirenovel
cf69c28979 Fix scope for logo/notice/deliberation deletion 2018-10-02 11:03:48 +02:00
gregoirenovel
c7cb1ac6e0 Merge branch 'dev' 2018-10-01 16:18:55 +02:00
gregoirenovel
696f3cd8f9
Merge pull request #2721 from betagouv/end-if
Do one thing per line
2018-10-01 16:18:44 +02:00
gregoirenovel
b994fa4206 Do one thing per line 2018-10-01 16:15:46 +02:00
Pierre de La Morinerie
8a55fba127
Merge pull request #2724 from betagouv/tour-de-france-fix
Fix a mistake in the Tour de France page
2018-10-01 16:11:13 +02:00
gregoirenovel
3965709bd0 Fix a mistake in the Tour de France page 2018-10-01 15:33:19 +02:00
Paul Chavard
8c5c70b783
Merge pull request #2688 from betagouv/wip/refactor-dropdowns
dropdown: refactor to make the button an actual button
2018-09-27 17:55:18 +02:00
Pierre de La Morinerie
cd938b4c36 dropdown: refactor to make the button an actual button 2018-09-27 17:43:08 +02:00
Paul Chavard
3ede25e1b0
Merge pull request #2706 from betagouv/fix-links
[Dossier] Correction des anciens liens restants
2018-09-27 17:42:29 +02:00
Pierre de La Morinerie
c79c1a2636 carto: update link to dossier 2018-09-27 17:22:59 +02:00
Pierre de La Morinerie
0526551e71 templates: update link to dossier 2018-09-27 17:22:59 +02:00
Pierre de La Morinerie
40cf7ebdcb mailers: update links to messagerie 2018-09-27 17:22:59 +02:00
Pierre de La Morinerie
5f1ce48d2e invites: update link to dossier 2018-09-27 17:22:59 +02:00
Pierre de La Morinerie
08dfe7d13a support: update link to messagerie 2018-09-27 17:22:59 +02:00
Pierre de La Morinerie
421a4107da dossier: rename dossier_spec to brouillon_spec 2018-09-27 17:22:59 +02:00
LeSim
266685dee9
Merge pull request #2705 from betagouv/dev
2018-09-27-02
2018-09-27 16:26:28 +02:00
Paul Chavard
8a01d60595
Merge pull request #2701 from tchak/password-check-as-ujs
Replace password strength js with ujs
2018-09-27 16:20:07 +02:00
Paul Chavard
3c66fceba5 Replace password strength js with ujs 2018-09-27 16:00:14 +02:00
Paul Chavard
f0aa78c8a8
Merge pull request #2693 from tchak/draft-demarche-ux
Add more information about lien demarche
2018-09-27 15:59:49 +02:00
Paul Chavard
5a795ae30b Add more information about lien demarche 2018-09-27 15:47:33 +02:00
Paul Chavard
0fb7408a45
Merge pull request #2690 from betagouv/fix_seed
Seed: fix weak password
2018-09-27 15:47:15 +02:00
simon lehericey
fe30c19aa4 Seed: fix weak password 2018-09-27 15:36:34 +02:00
LeSim
b0bca99d9e
Merge pull request #2700 from betagouv/fix_2696_mean_instruction_time
Fix 2696 mean instruction time
2018-09-27 15:32:10 +02:00
simon lehericey
29e40fa061 [fix #2696] Rake: add task to fill empty instruction_at 2018-09-27 15:02:38 +02:00
simon lehericey
4d4dba1550 Procedure: small renaming on mean_time 2018-09-27 15:02:38 +02:00
simon lehericey
6725c5e34c Procedure: add test on mean_instruction_time 2018-09-27 15:02:38 +02:00
LeSim
7fc5580520
Merge pull request #2691 from betagouv/fix_2449_encrypted_token
Fix 2449 encrypted token
2018-09-27 11:46:52 +02:00
LeSim
7c6a2ae8f1
Merge pull request #2695 from betagouv/dev
2018-09-27-01
2018-09-27 10:49:35 +02:00
simon lehericey
4300d7abf8 [fix #2449] Migration: remove administrateur api_token column 2018-09-27 10:24:56 +02:00
simon lehericey
88f7e888c3 Administrateur: do not save api_token in clear text anymore 2018-09-27 10:24:56 +02:00
simon lehericey
16566b46c0 DossierController: private some methods 2018-09-27 10:24:56 +02:00
simon lehericey
912371fbd6 DossierController: use new token validation 2018-09-27 10:24:56 +02:00
simon lehericey
8dd4a1ca4e ProcedureController: remove useless logger call 2018-09-27 10:24:56 +02:00
simon lehericey
3c95273d6f ProcedureController: use new token validation 2018-09-27 10:24:56 +02:00
simon lehericey
0b2a98cdce ApiController: private some methods 2018-09-27 10:24:56 +02:00
simon lehericey
f7c23bb435 ApiController: remove ensure_token_is_present
An admin without token answer false to admin.api_token_valid?(api_token) with api_token=*
2018-09-27 10:24:56 +02:00
simon lehericey
4a04f2e59f ApiController: check token validity for a given admin 2018-09-27 10:24:56 +02:00
simon lehericey
d576d426f4 ApiController: remove old authenticate logic
The old logic cannot work anymore as we cannot `find_by api_token`
2018-09-27 10:24:56 +02:00
simon lehericey
6837c79dd1 Spec: use have_http_status matcher 2018-09-27 10:24:56 +02:00
simon lehericey
2b46a56259 Spec: simplify 2018-09-27 10:24:56 +02:00
simon lehericey
d14944fba3 Spec: mutualize subject 2018-09-27 10:24:56 +02:00
simon lehericey
7b27f00a23 Spec: do not use the deprecated api_token 2018-09-27 10:24:56 +02:00
simon lehericey
9a6e985bac Spec: remove useless require 2018-09-27 10:24:56 +02:00