Commit graph

5550 commits

Author SHA1 Message Date
Frederic Merizen
ad040e354a [Fix #2071] Let premailer generate a plain text version of html emails 2018-06-09 09:00:33 +02:00
LeSim
6e1bff0d5d
Merge pull request #2075 from betagouv/fix_2072_user_cannot_modify_a_dossier_in_instruction
[fix #2072] DossierController: check the user can update the dossier
2018-06-08 16:38:59 +02:00
simon lehericey
e11392981d [fix #2072] DossierController: check the user can update the dossier 2018-06-08 16:24:29 +02:00
gregoirenovel
db4c0e11d2
Merge pull request #2074 from betagouv/fix-typo
Fix a typo
2018-06-08 15:16:58 +02:00
gregoirenovel
24e37842ee Fix a typo 2018-06-08 15:14:22 +02:00
gregoirenovel
19f5c66faa
Merge pull request #2058 from betagouv/preactivate-admin-gestionnaire-users
Retroactively pre(?)activate users for gestionnaires and administrateurs
2018-06-08 10:58:16 +02:00
Frederic Merizen
7c6b60bfcb Retroactively pre(?)activate users for gestionnaires and administrateurs 2018-06-08 10:49:31 +02:00
gregoirenovel
ddbf34f5fa
Merge pull request #2065 from betagouv/moar-fixes
Fix a bug
2018-06-07 18:31:40 +02:00
gregoirenovel
94b72eeb46 Fix a bug 2018-06-07 18:10:05 +02:00
gregoirenovel
c4a6e74223
Merge pull request #2064 from betagouv/more-fixes
More fixes
2018-06-07 17:53:51 +02:00
gregoirenovel
8bd322f7b0 Fix a filename 2018-06-07 17:28:56 +02:00
gregoirenovel
d3e96b77dd Fix a bug in a task 2018-06-07 17:26:15 +02:00
gregoirenovel
96a4ebd860 Improve a task 2018-06-07 17:25:39 +02:00
gregoirenovel
4db432a4ca Remove Mailers module for app mailers 2018-06-07 17:23:12 +02:00
gregoirenovel
0a124e0fd2
Merge pull request #2063 from betagouv/fixes
Fixes
2018-06-07 16:12:46 +02:00
gregoirenovel
88aa325784 Fix a typo 2018-06-07 16:07:15 +02:00
gregoirenovel
161ad8151b Make the task name match the filename 2018-06-07 16:07:15 +02:00
gregoirenovel
7a73db54c8
Merge pull request #2044 from betagouv/fix-1736
Fix #1736
2018-06-07 16:06:57 +02:00
gregoirenovel
346b32fbd4 [Fix #1736] Assign the deal and person to the person who accepted them 2018-06-07 16:04:15 +02:00
gregoirenovel
e7995bd1c9
Merge pull request #2060 from betagouv/fix-bug
Forgot to change a local variable into an instance variable
2018-06-07 15:19:54 +02:00
gregoirenovel
b88cea3c18 Change a deliver into a deliver_later 2018-06-07 15:14:26 +02:00
gregoirenovel
f06132edf1 Forgot to change a local variable into an instance variable 2018-06-07 15:05:30 +02:00
gregoirenovel
9a97b21721
Merge pull request #2048 from betagouv/attestation-fix
Attestation fix
2018-06-06 18:33:25 +02:00
gregoirenovel
478598f74c Add a task to destroy, regenerate, and send new attestations
For dossiers that were accepté, went back to
en instruction, and then were accepté again
2018-06-06 18:25:11 +02:00
Frederic Merizen
ead4a6a2fd
Merge pull request #2055 from betagouv/fix-double-confirmation
Fix double confirmation
2018-06-06 18:01:50 +02:00
Frederic Merizen
74135b193a [Fix #2042] Pre-validate users for administrateurs
Rather kludgy but better than the double-validation that is required now
2018-06-06 17:45:48 +02:00
Frederic Merizen
c3254eddae [Fix #2043] Pre-validate users for gestionnaires
Rather kludgy but better than the double-validation that is required now
2018-06-06 17:45:48 +02:00
Frederic Merizen
1193feb5f8
Merge pull request #2054 from betagouv/fix-bizdev-mailer
Fix bizdev mailer
2018-06-06 17:43:19 +02:00
Frederic Merizen
65e9025d5d Add at least minimal test for AdministrationMailer 2018-06-06 16:08:18 +02:00
Frederic Merizen
695f5b2705 Fix class methods on BizDev module
and add missing tests
2018-06-06 16:07:29 +02:00
Frederic Merizen
38ee42d446
Merge pull request #2053 from betagouv/bump-sinatra
Bump Sinatra
2018-06-06 13:48:37 +02:00
Frederic Merizen
49e0351c35 Bump Sinatra 2018-06-06 12:02:46 +02:00
gregoirenovel
72a2576122
Merge pull request #2049 from betagouv/attestation-resend
Resend attestation for a procedure whose attestation template changed
2018-06-05 17:43:43 +02:00
gregoirenovel
bb3dcbbf22 Resend attestation for a procedure whose attestation template changed 2018-06-05 17:37:08 +02:00
gregoirenovel
54c08826d1
Merge pull request #2041 from betagouv/fix-1735
Fix #1735
2018-06-04 10:12:02 +02:00
gregoirenovel
41e8350cbe [Fix #1735] Sign the admin account creation email 2018-06-01 20:48:50 +02:00
gregoirenovel
6992bea141 Add the BizDev module 2018-06-01 20:48:50 +02:00
gregoirenovel
6be05e8fc5 Add a local variable to the bizdev_signature partial 2018-06-01 20:48:50 +02:00
Frederic Merizen
ece58290de
Merge pull request #2040 from betagouv/frederic/fix-1946/show-retention-time-in-administration
[#1946] Show retention times in procedure administration summary
2018-06-01 17:54:41 +02:00
Frederic Merizen
52bb40ab20 [#1946] Show retention times in procedure administration summary 2018-06-01 17:35:04 +02:00
gregoirenovel
e74ea38eb2
Merge pull request #2038 from betagouv/fix-885
Fix #885
2018-06-01 17:20:10 +02:00
gregoirenovel
b82ed65568 [Fix #885] Convert .text.erb to .html.haml 2018-06-01 17:14:48 +02:00
gregoirenovel
efdcbe4265 [Fix #885] Convert .html.erb to .html.haml 2018-06-01 17:14:48 +02:00
gregoirenovel
bd9d913a74 [Fix #885] Remove unused mail templates 2018-06-01 17:14:48 +02:00
gregoirenovel
7d94f19d37
Merge pull request #2039 from betagouv/fix-1775
[Fix #1775] Improve the wording of the emails templates
2018-06-01 17:14:36 +02:00
gregoirenovel
f6c1229cf0 [Fix #1775] Improve the wording of the emails templates 2018-06-01 17:12:10 +02:00
gregoirenovel
55d71e53e6
Merge pull request #2034 from betagouv/useless-file
Remove an unused file
2018-06-01 17:11:59 +02:00
gregoirenovel
42650cef72 Remove an unused file 2018-06-01 17:07:23 +02:00
Frederic Merizen
8efc12f164
Merge pull request #1962 from betagouv/frederic/fix-1946/edit-retention-time
Frederic/fix 1946/edit retention time
2018-06-01 17:01:31 +02:00
Frederic Merizen
346687bd33 [#1946] Once durees de conservation have been set, forbid unsetting them 2018-06-01 16:46:39 +02:00