gregoirenovel
|
346b32fbd4
|
[Fix #1736] Assign the deal and person to the person who accepted them
|
2018-06-07 16:04:15 +02:00 |
|
gregoirenovel
|
2568b8d1e0
|
Merge branch 'dev'
|
2018-06-07 15:23:37 +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 |
|
Frederic Merizen
|
8f08c95993
|
Merge pull request #2057 from betagouv/dev
2018-06-07-01
|
2018-06-07 14:51:38 +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 |
|
Frederic Merizen
|
bfa601d832
|
[#1946] Temporarily allow legacy procedures not to have a retention time
|
2018-06-01 16:46:39 +02:00 |
|
Frederic Merizen
|
42765efb91
|
[#1946] Add validation to durees conservation
|
2018-06-01 16:46:39 +02:00 |
|
Frederic Merizen
|
d3cfcaa8ac
|
[#1946] Add durees_conservation_required flag to procedures
|
2018-06-01 16:46:39 +02:00 |
|
Frederic Merizen
|
648483ac76
|
[#1946] Allow admins to edit data retention time
|
2018-06-01 16:46:39 +02:00 |
|
Frederic Merizen
|
5325830d62
|
[#1946] Extract test helper method
|
2018-06-01 16:46:39 +02:00 |
|
gregoirenovel
|
74366c6268
|
Merge pull request #2033 from betagouv/email-improvements
Email improvements
|
2018-06-01 15:48:58 +02:00 |
|
gregoirenovel
|
f8f760db62
|
Use p tags in emails to improve legability
|
2018-06-01 15:42:56 +02:00 |
|
gregoirenovel
|
dd66089d5c
|
Put the title in an instance variable when needed to avoid repetition
|
2018-06-01 15:42:56 +02:00 |
|
gregoirenovel
|
1cd06b68d4
|
Remove extra markup from the avis invitation email
|
2018-06-01 15:42:56 +02:00 |
|
gregoirenovel
|
4f2509861b
|
Improve the wording of the avis email
|
2018-06-01 15:42:56 +02:00 |
|
Frederic Merizen
|
0173ca4ce8
|
Merge pull request #2035 from betagouv/frederic/remove-duplicate-translations
Remove duplicate translations
|
2018-06-01 15:34:37 +02:00 |
|
Frederic Merizen
|
c39a58749f
|
Remove duplicate translations
There is a default translation for `blank` already
|
2018-06-01 15:21:25 +02:00 |
|
gregoirenovel
|
db2f2e39e9
|
Merge pull request #2029 from betagouv/fix-1858
[Fix #1858] Improve the avis email’s style
|
2018-06-01 14:13:41 +02:00 |
|
gregoirenovel
|
bc8f74dc42
|
[Fix #1858] Improve the avis email’s style
|
2018-06-01 14:11:06 +02:00 |
|
gregoirenovel
|
23e909928a
|
Merge pull request #2025 from betagouv/fix-886
Fix #886
|
2018-06-01 14:10:44 +02:00 |
|
gregoirenovel
|
a0b82696dd
|
[Fix #886] devise/mailer -> devise_mailer
|
2018-06-01 11:47:46 +02:00 |
|