Commit graph

19585 commits

Author SHA1 Message Date
Frederic Merizen
bdf2831209 [Fix #1691] Do not attempt to 'wrap' <p>s in other <p>s
It cannot be done because <p>s don't nest in HTML, so use
<div>s for the wrapping instead
2018-03-29 11:20:17 +02:00
Frederic Merizen
8efb287b4a
Merge pull request #1751 from betagouv/frederic/fix_1690-migrate_procedure_descriptions_to_plain_text
Fix #1690 – migrate procedure descriptions to plain text
2018-03-29 11:18:02 +02:00
Frederic Merizen
3f62bc3407 [Fix #1690] Strip html markup from procedure descriptions 2018-03-29 11:13:34 +02:00
Frederic Merizen
28cced9a95
Merge pull request #1754 from betagouv/frederic/fix_1689-text_only_procedure_descriptions
[Fix #1689] Only allow plain text for procedure descriptions
2018-03-29 11:10:40 +02:00
Frederic Merizen
d825c3d586 [Fix #1689] Only allow plain text for procedure descriptions 2018-03-29 10:52:37 +02:00
gregoirenovel
657d8d9368
Merge pull request #1743 from tchak/administrateur-features-enabled
Add administrateur#feature_enabled? method
2018-03-28 18:44:24 +02:00
Paul Chavard
322f93afbe Add administrateur#feature_enabled? method 2018-03-28 17:19:07 +02:00
LeSim
d1b3530da0
Merge pull request #1746 from betagouv/trailing-spaces
Remove trailing spaces
2018-03-28 16:52:00 +02:00
gregoirenovel
f343e08ce2 Remove trailing spaces 2018-03-28 15:06:03 +02:00
Paul Chavard
9749c05686
Merge pull request #1669 from betagouv/api-entreprise-refactor
Api entreprise refactor
2018-03-28 14:57:16 +02:00
gregoirenovel
681e33b850 Simplify RNAAdapter#to_params and unify the type of objects it returns 2018-03-28 10:55:15 +02:00
gregoirenovel
caf2e50954 Make #to_params return blank hashes if we have no data 2018-03-28 10:55:15 +02:00
gregoirenovel
0022ea71c5 Use #transform_keys instead of .map.to_h 2018-03-28 10:55:14 +02:00
gregoirenovel
7794973774 Simplify SIRETService#fetch 2018-03-28 10:55:14 +02:00
gregoirenovel
4b6b583120 Delete useless return statements 2018-03-28 10:55:14 +02:00
gregoirenovel
94a257f5b0 Add missing spaces 2018-03-28 10:55:14 +02:00
gregoirenovel
de483ac0f6 Format all attr_to_fetch methods the same way 2018-03-28 10:55:14 +02:00
gregoirenovel
b479833699 Reduce method calls 2018-03-28 10:55:14 +02:00
gregoirenovel
8b46df3176 Add a new variable to improve readability 2018-03-28 10:55:14 +02:00
gregoirenovel
3dd76c3d68 Remove useless success? methods 2018-03-28 10:55:14 +02:00
gregoirenovel
a9c1c9f551 Improve #success? methods 2018-03-28 10:55:14 +02:00
gregoirenovel
19add3f534 Use if-flows instead of rescue-flows 2018-03-28 10:55:14 +02:00
gregoirenovel
182afee970 to_params -> to_array 2018-03-28 10:52:54 +02:00
gregoirenovel
3e16eff9a0 Unify data_source methods 2018-03-28 10:50:27 +02:00
gregoirenovel
c20689c9cc Merge branch 'dev' 2018-03-28 10:24:59 +02:00
gregoirenovel
4a225bfcbb
Merge pull request #1734 from betagouv/fix_1550_admin_activation_email
[fix #1550] unify HS and activation mail, send doc as well
2018-03-28 10:24:35 +02:00
simon lehericey
07c9830da0 [fix #1550] unify HS and activation mail, send doc as well 2018-03-27 18:09:27 +02:00
Paul Chavard
2f68b7c4b3 Tweak timeout API Entreprises 2018-03-27 17:59:51 +02:00
Paul Chavard
5ae8eb3383 Lower timeout for API Entreprise 2018-03-27 17:16:56 +02:00
LeSim
0fda88512c
Merge pull request #1533 from betagouv/less_sql_query_in_user_ui
Less sql query in user ui
2018-03-27 16:53:47 +02:00
simon lehericey
66a113c7db Dossier: remove uncessary query on order_champ_v2 2018-03-27 16:48:38 +02:00
simon lehericey
8ac5415ce0 DossierController: avoid unecessary user fetch 2018-03-27 16:48:38 +02:00
LeSim
360e368be3
Merge pull request #1731 from betagouv/fix_test
DubiousProcedureSpec: fix test (build 8212)
2018-03-27 16:13:51 +02:00
simon lehericey
32913aae55 DubiousProcedureSpec: fix test (build 8212) 2018-03-27 16:06:52 +02:00
LeSim
7df3e0d05f
Merge pull request #1732 from betagouv/refuse_pipedrive_deal
Refuse pipedrive deal
2018-03-27 16:06:09 +02:00
simon lehericey
289ddb5419 [fix #1670] Manager send the refused admin email 2018-03-27 16:02:09 +02:00
simon lehericey
d0431a28f2 Pipedrive: manager can refuse a deal 2018-03-27 15:56:28 +02:00
gregoirenovel
8d7c639f8f
Merge pull request #1703 from betagouv/pipedrive_for_real
Pipedrive for real
2018-03-27 15:40:54 +02:00
simon lehericey
2102130fa3 Pipedrive: allow super admin to choose target pipeline 2018-03-27 14:52:39 +02:00
simon lehericey
6a74aaa42a [fix #1697] Pipedrive: use a job to process an admin creation 2018-03-27 14:52:39 +02:00
simon lehericey
31adc8e990 Pipedrive: Rename pipedrive_dev_id 2018-03-27 14:52:39 +02:00
simon lehericey
ec3d558af0 Pipedrive: extract methods in service 2018-03-27 14:52:39 +02:00
gregoirenovel
b7d31aac96
Merge pull request #1728 from tchak/handle-partial-success-as-error
Improvements to API Entreprise: handle partial success as error and ajax errors
2018-03-27 14:02:19 +02:00
Paul Chavard
6b7d0ccb82 Remove unused rescue in SIRET form controller 2018-03-27 13:56:22 +02:00
Paul Chavard
2fc03e9079 Handle ajax errors on SIRET form 2018-03-27 13:56:22 +02:00
Paul Chavard
a17ac5a9db Remove debug logger 2018-03-26 17:44:51 +02:00
Paul Chavard
2505419b08 Treat partial success from api entreprises as errors
We might refine this later, but for now this will give an error instead of unspecified state
2018-03-26 17:44:37 +02:00
gregoirenovel
d72e0e92a9
Merge pull request #1725 from tchak/fix-api-entreprise-timouts
Use Typhoeus and set agressive timeouts
2018-03-26 17:01:43 +02:00
Paul Chavard
f35aef0eb6 Use Typhoeus and set agressive timeouts 2018-03-26 16:53:42 +02:00
gregoirenovel
e8abdd1e1a Merge branch 'dev' 2018-03-23 14:30:31 +01:00