Commit graph

4522 commits

Author SHA1 Message Date
gregoirenovel
27a8aba53e Allow the cloning of another admininistrateur’s procedure 2018-01-08 14:55:07 +01:00
gregoirenovel
ec5b9c86ce Add the admin argument to Procedure#clone 2018-01-08 14:55:07 +01:00
gregoirenovel
9c0fa30d5b Merge branch 'dev' 2018-01-08 10:02:30 +01:00
gregoirenovel
7f44818796
Merge pull request #1176 from sgmap/fix_1110-port_attestation_tags_to_mail
Fix 1110 4. port attestation tags to mail
2018-01-05 18:00:41 +01:00
Frederic Merizen
6139c614b0 [#1110] Migrate legacy tags to new tags in mail templates 2018-01-05 17:42:25 +01:00
Frederic Merizen
75a3d0f3db [#1110] use modern rather than legacy tags in default mail templates 2018-01-05 17:42:25 +01:00
Frederic Merizen
deea23139f [#1110] Use TagsSubstitutionConcern as engine for mail template tags 2018-01-05 17:42:25 +01:00
gregoirenovel
de30b27ad1
Merge pull request #1175 from sgmap/fix_1110-align_mail_and_document_templates
Fix 1110 3. align mail and document templates
2018-01-05 17:23:20 +01:00
Frederic Merizen
ab63f80080 [#1110] Motivation and date de décision are only tags for terminé dossiers 2018-01-05 16:35:29 +01:00
Frederic Merizen
e985439416 [#1110] Use tags method rather than ALLOWED_TAGS class constant 2018-01-05 12:48:07 +01:00
Frederic Merizen
b9a1f707f5 [#1110] name => libelle in mail templates
to match attestation templates
2018-01-05 12:48:07 +01:00
Frederic Merizen
8d77cd58c6 [#1110] Make linked procedure available to mail model 2018-01-05 12:48:07 +01:00
gregoirenovel
d80eb7a02b
Merge pull request #1174 from sgmap/fix_1110-port_mail_tags_to_attestation
Fix 1110 - 2. port mail tags to attestation
2018-01-05 12:08:40 +01:00
Frederic Merizen
ad0462f7ff [#1110] Port libellé procédure tag from mail templates 2018-01-05 11:51:08 +01:00
Frederic Merizen
ee109b24e3 [#1110] Port date de décision tag from mail templates 2018-01-05 11:51:08 +01:00
Frederic Merizen
6a85094e1a [#1110] Make processed_at date available for attestation generation 2018-01-05 11:51:08 +01:00
gregoirenovel
4805e4a5b2
Merge pull request #1173 from sgmap/fix_1110-clean_up_attestation_template
Fix 1110 - 1. clean up attestation template
2018-01-05 11:45:32 +01:00
Frederic Merizen
3dfc37826a [#1110] Extract document template concern from attestation template class 2018-01-05 10:57:27 +01:00
Frederic Merizen
34d9408ed3 [#1110] DRYer spec 2018-01-04 16:20:08 +01:00
Frederic Merizen
b603af1ec7 [#1110] Simplification: directly use symbols 2018-01-04 16:20:08 +01:00
gregoirenovel
b1b8ebe1a3
Merge pull request #1168 from sgmap/remove_will_paginate
Remove will paginate
2018-01-04 11:56:42 +01:00
Mathieu Magnin
62d8381ef7 Remove will paginate 2018-01-03 14:35:48 +01:00
Mathieu Magnin
f983fc3ea3
Merge pull request #1167 from sgmap/improve_admin_tasks
Improve super admin management
2018-01-03 14:31:15 +01:00
Mathieu Magnin
4c8c26f250 Improve super admin management 2018-01-03 12:17:44 +01:00
gregoirenovel
582b7bf889
Merge pull request #1166 from sgmap/readme
README improvements
2018-01-03 11:39:14 +01:00
gregoirenovel
33dc43a177 Rework the README’s dependencies part 2018-01-03 11:34:13 +01:00
gregoirenovel
3479a4630f Add an information about GitHub credentials in the README 2018-01-03 11:31:25 +01:00
gregoirenovel
edbba8a230 Merge branch 'dev' 2018-01-03 10:48:39 +01:00
gregoirenovel
cabb0a9953
Merge pull request #1162 from tchak/procfile
add a Procfile and document usage of hivemind
2018-01-03 10:45:15 +01:00
Paul Chavard
25814cb2fe Add a Procfile and document usage of hivemind 2018-01-02 11:20:22 +01:00
gregoirenovel
0837c7bad9
Merge pull request #1160 from sgmap/fix_1100
[Fix #1100] Administrateur can renew his API Token
2017-12-26 21:36:43 +01:00
Mathieu Magnin
98ac496aa5 [Fix #1100] Administrateur can renew his API Token 2017-12-26 18:30:36 +01:00
Frederic Merizen
260858076e
Merge pull request #1158 from sgmap/document-auth-files
Document authentication file stubs
2017-12-22 18:21:31 +01:00
Frederic Merizen
0f6396ac1e Document authentication file stubs 2017-12-22 17:18:19 +01:00
Frederic Merizen
4e24785f3f
Merge pull request #1157 from sgmap/rubocop-focus
Make Rubocop check for focused specs
2017-12-22 17:12:10 +01:00
Frederic Merizen
6d223aee06 Make Rubocop check for focused specs 2017-12-22 17:05:57 +01:00
gregoirenovel
04e89da2f4
Merge pull request #1156 from sgmap/fix-focus
Remove test focus that shouldn't have been committed in 48cb623
2017-12-22 16:54:14 +01:00
Frederic Merizen
888c25fa34 Remove test focus that shouldn't have been committed in 48cb623 2017-12-22 16:42:21 +01:00
gregoirenovel
df8bc786e6
Merge pull request #1145 from sgmap/fix_1096
[RGS] GitHub Oauth
2017-12-22 12:57:57 +01:00
gregoirenovel
0c83dfe778 Merge branch 'dev' 2017-12-22 11:11:37 +01:00
Mathieu Magnin
fab00b1674 [Fix #1096] Add administration email in new administrateur email 2017-12-22 11:10:25 +01:00
Mathieu Magnin
39dc5718c2 [Fix #1096] task to create new Administrations 2017-12-22 11:10:25 +01:00
Mathieu Magnin
5c9d82d46f [Fix #1096] task to delete old accounts 2017-12-22 11:10:25 +01:00
Mathieu Magnin
4990595430 [Fix #1096] Sign in with GitHub page 2017-12-22 11:10:24 +01:00
Mathieu Magnin
7c0fdbc9f8 [Fix #1096] Github Oauth 2017-12-22 11:10:24 +01:00
Mathieu Magnin
46b14e97ed [Fix #1096] Add omniauth gem to connect with Github 2017-12-22 11:10:24 +01:00
gregoirenovel
271860ae34
Merge pull request #1153 from sgmap/fix_flaky_test
Fix flaky test
2017-12-22 11:04:29 +01:00
Frederic Merizen
ff2c4d7bfe Fix flaky test
1) StatsController#avis_average_answer_time should include [1512120443, 9.5]
     Failure/Error: it { is_expected.to include [3.week.ago.to_i, 9.5] }
       expected [[1512120442, 9.5], [1512725242, 7.33], [1513330042, 1.0]] to include [1512120443, 9.5]
     # ./spec/controllers/stats_controller_spec.rb:263:in `block (3 levels) in <top (required)>'
2017-12-22 10:58:48 +01:00
gregoirenovel
f66fa2fe45
Merge pull request #1124 from sgmap/fix-1102
[Fix #1102] Améliorer le texte qui explique ce qu'est un avis confidentiel
2017-12-22 10:49:46 +01:00
gregoirenovel
6191640262 [Fix #1102] Add more information to the avis confidentiality warning 2017-12-22 10:32:54 +01:00