Commit graph

6811 commits

Author SHA1 Message Date
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
gregoirenovel
197089a746
Merge pull request #1700 from betagouv/prepare-1626
[Ref #1626] Add the administrateurs_procedures table and associations
2018-03-23 14:18:18 +01:00
gregoirenovel
2385548a03 [Ref #1626] Add the administrateurs_procedures table and associations 2018-03-23 11:40:03 +01:00
gregoirenovel
da69ff3714 Merge branch 'dev' 2018-03-23 10:17:16 +01:00
gregoirenovel
a7a60f92cf
Merge pull request #1688 from betagouv/remove-auto-margin
[Fix #1687] Align sign in/up form to the top
2018-03-22 17:24:58 +01:00
gregoirenovel
5b04fa2a4c [Fix #1687] Align sign in/up form to the top 2018-03-22 17:16:39 +01:00
Frederic Merizen
6a9016fbfd
Merge pull request #1695 from betagouv/frederic/fix_1677-remove_invite_instructeur
#1677 remove invite instructeur
2018-03-22 16:54:20 +01:00
Frederic Merizen
cab670b1ad [#1677] Simplify code 2018-03-22 16:40:57 +01:00
Frederic Merizen
c413dfa127 [#1677] No longer create InviteGestionnaires 2018-03-22 16:40:57 +01:00
LeSim
6c3f287f68
Merge pull request #1686 from betagouv/fix_1601_pipedrive_manager_integration
Fix 1601 pipedrive manager integration
2018-03-22 15:50:25 +01:00
simon lehericey
9eb28faa10 [fix #1601] accept demandes in manager 2018-03-22 15:37:16 +01:00
simon lehericey
9e566596fa [fix #1601] show pipedrive demandes in manager 2018-03-22 15:37:16 +01:00
gregoirenovel
e92853853d
Merge pull request #1694 from betagouv/frederic/fix-CVE-2018-8048
Upgrade loofah 2.2.0 -> 2.2.1 to fix CVE-2018-8048
2018-03-21 20:07:35 +01:00
Frederic Merizen
04b4fac89c Upgrade loofah 2.2.0 -> 2.2.1 to fix CVE-2018-8048 2018-03-21 19:58:37 +01:00
Frederic Merizen
0dabd28ea5
Merge pull request #1685 from betagouv/enable-cop
Enable cop
2018-03-21 10:59:50 +01:00
gregoirenovel
ecc0f88417 Enable the cop that checks for brackets in method definitions 2018-03-20 18:03:39 +01:00
gregoirenovel
19606d5b94
Merge pull request #1684 from betagouv/fix-method-definition-brackets
Add missing brackets around parameters in method definitions
2018-03-20 18:03:23 +01:00
Frederic Merizen
2fa88a432b Add missing brackets around parameters in method definitions 2018-03-20 17:54:51 +01:00
gregoirenovel
7a3a088208 Merge branch 'dev' 2018-03-20 17:35:41 +01:00
gregoirenovel
9e19c78b48
Merge pull request #1683 from betagouv/fix-1682
Fix contact link on the landing page
2018-03-20 17:29:37 +01:00
gregoirenovel
862d8051c8 Fix contact link on the landing page 2018-03-20 17:15:41 +01:00
gregoirenovel
d410706998 Merge branch 'dev' 2018-03-20 17:04:09 +01:00
LeSim
233e0a8dc7
Merge pull request #1673 from betagouv/add-timestamps
[Fix #1534] Add missing timestamps columns
2018-03-20 17:01:06 +01:00
gregoirenovel
8555a51350 [Fix #1534] Add missing timestamps columns 2018-03-20 16:53:47 +01:00
gregoirenovel
0a5fd83c92
Merge pull request #1672 from betagouv/remove-mandataire-social-column
Remove mandataire social column
2018-03-20 16:52:39 +01:00