Commit graph

5245 commits

Author SHA1 Message Date
gregoirenovel
f114f1478d
Merge pull request #2020 from betagouv/bump-delayed-job-web
Remove delayed_job_web version lock
2018-06-01 10:43:53 +02:00
gregoirenovel
e5869f2bec Remove delayed_job_web version lock
Now that the security patches have been patched
2018-06-01 10:42:40 +02:00
gregoirenovel
dc88fb46b3
Merge pull request #2019 from betagouv/cleanup-mailers
Cleanup mailers
2018-06-01 10:40:24 +02:00
gregoirenovel
23931a7591 Remove the contact_email locale 2018-06-01 00:00:11 +02:00
gregoirenovel
185f08f63e Add constants for email addresses 2018-06-01 00:00:11 +02:00
gregoirenovel
a3f5ae9d0b Add a variable to improve readability 2018-06-01 00:00:11 +02:00
gregoirenovel
8eeb10bc5c Add parentheses 2018-06-01 00:00:11 +02:00
gregoirenovel
a60f1c434e Improve the mailers readability 2018-06-01 00:00:11 +02:00
Paul Chavard
740a83f665
Merge pull request #2017 from betagouv/frederic/fix-2015-clone-procedure-error-handling
[Fix #2015] Make sur all data is initialised for index view
2018-05-31 18:41:03 +02:00
Frederic Merizen
b571f0706c [Fix #2015] Make sur all data is initialised for index view 2018-05-31 18:32:13 +02:00
Frederic Merizen
d28d467aea Merge branch 'dev' 2018-05-31 17:07:02 +02:00
LeSim
5a699162c5
Merge pull request #1904 from betagouv/fix_1897_legal_ref
[fix #1897] Procedure: add legal reference
2018-05-31 17:02:22 +02:00
simon lehericey
18ad227df5 [fix #1897] Procedure: can delete a deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
0e690c90cc Procedure: clone the deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
fa14db1cbf Procedure: add deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
a96889310b Procedure: add legal reference 2018-05-31 16:55:31 +02:00
Paul Chavard
25f0b6258a
Merge pull request #2011 from tchak/manager-users-and-gestionnaires
Add users and gestionnaires to manager
2018-05-31 16:20:33 +02:00
Paul Chavard
e2a126e37a Add users and gestionnaires to manager 2018-05-31 15:18:24 +02:00
gregoirenovel
3f99f41372
Merge pull request #2004 from betagouv/clean
Clean
2018-05-31 15:09:18 +02:00
Frederic Merizen
32914a5d08 Merge branch 'dev' 2018-05-31 14:42:40 +02:00
gregoirenovel
0329b1db68 Use User#owns_or_invite? instead of Dossier#owner_or_invite? 2018-05-31 14:39:43 +02:00
gregoirenovel
4e9565a5df Adds User#owns? 2018-05-31 14:39:43 +02:00
gregoirenovel
a007d6e3eb Avoid trailing spaces in strings 2018-05-31 14:29:38 +02:00
Frederic Merizen
c832938a11
Merge pull request #1997 from betagouv/frederic/fix-1995-add_gender_birthdate_to_api
[#1995] Add gender and birthdate fields to API
2018-05-31 14:26:25 +02:00
Frederic Merizen
2f769ca933 [#1995] Add gender and birthdate fields to API 2018-05-31 14:21:37 +02:00
gregoirenovel
a872acfb97
Merge pull request #1983 from betagouv/improve-import-db
Do not download backup if exists
2018-05-31 14:03:16 +02:00
Mathieu Magnin
2f5e02c90e Do not download backup if exists 2018-05-31 13:59:16 +02:00
gregoirenovel
e6e8a95ca3
Merge pull request #2009 from betagouv/fix_dubious_procedure_job
DubiousProcedure: update forbidden words
2018-05-31 13:58:03 +02:00
simon lehericey
126c2f2687 DubiousProcedure: update forbidden words 2018-05-31 13:52:33 +02:00
gregoirenovel
9c57a7f786
Merge pull request #2008 from betagouv/fix_demande_view
ManagerDemandeView: does not bug when there is no demand
2018-05-31 13:52:14 +02:00
simon lehericey
167ca26036 ManagerDemandeView: does not bug when there is no demand 2018-05-31 13:47:42 +02:00
gregoirenovel
2d2490477e
Merge pull request #2006 from betagouv/clean-notification-mailer
Clean notification mailer
2018-05-31 13:45:47 +02:00
gregoirenovel
32a2ab153f Remove vars_mailer and simplify code 2018-05-31 12:10:06 +02:00
gregoirenovel
2e0abb054c Stop doing something useless 2018-05-31 12:10:06 +02:00
gregoirenovel
641f72a517 Stop relying on instance variables 2018-05-31 12:10:06 +02:00
gregoirenovel
0d8cb50a30 Introduce a local variable to improve legibility 2018-05-31 12:10:06 +02:00
gregoirenovel
8eacfa801c Use send_mail when possible 2018-05-31 12:10:06 +02:00
gregoirenovel
02c2f681aa Reorder some methods 2018-05-31 12:10:06 +02:00
gregoirenovel
a57e2388f6 Unify NotificationMailer methods’ signatures 2018-05-31 12:10:06 +02:00
gregoirenovel
7ea37abefa Use a local variable instead of an instance variable 2018-05-31 12:10:06 +02:00
gregoirenovel
bb8adba9b9 Use goddamn parentheses 2018-05-31 12:10:06 +02:00
gregoirenovel
bcc2970de4
Merge pull request #2005 from betagouv/frederic/fix-2002-create-missed-ar-messages
[Fix #2002] Create missing accuse de reception messages
2018-05-31 12:09:52 +02:00
Frederic Merizen
44af4e95f1 [Fix #2002] Create missing accuse de reception messages 2018-05-31 12:03:50 +02:00
gregoirenovel
e91029a25d
Merge pull request #2003 from betagouv/clean-2
Clean
2018-05-31 11:54:01 +02:00
gregoirenovel
661010100d [Fix #1536] Remove stringupcasepatch 2018-05-31 11:49:25 +02:00
gregoirenovel
faa56956c5 [Fix #1744] Remove useless variable 2018-05-31 11:49:25 +02:00
gregoirenovel
dc045bdefb [Fix #1808] Use &. where possible 2018-05-31 11:49:25 +02:00
Mathieu Magnin
bf3c05d729
Merge pull request #2007 from betagouv/dev
MEP 2018-05-31-01
2018-05-31 11:37:51 +02:00
Mathieu Magnin
9df649d8cc
Merge pull request #2001 from betagouv/gprd-delete-dossier
Gprd delete dossier
2018-05-31 09:44:41 +02:00
Mathieu Magnin
eb1fbb7dbc Delete button, notify user and admin then delete dossier 2018-05-30 18:01:36 +02:00