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
Frederic Merizen
51bf2ef374
Merge pull request #1150 from sgmap/fix_1143-motivation_in_attestation
...
[Fix #1143 ] Set motivation before generating attestation
2017-12-22 10:29:18 +01:00
Frederic Merizen
2ae67a44f2
[ Fix #1143 ] Set motivation before generating attestation
2017-12-22 10:23:40 +01:00
Mathieu Magnin
8af0011271
Merge branch 'dev'
2017-12-22 09:38:39 +01:00
gregoirenovel
d222c707f5
Merge pull request #1133 from sgmap/fix_1118
...
[Fix #1118 ] New ui is the default ui for gestionnaire
2017-12-22 08:26:50 +01:00
Mathieu Magnin
642dc4ba21
[ Fix #1118 ] New ui is the default ui for gestionnaire
2017-12-21 23:20:59 +01:00
gregoirenovel
f6d34e07b7
Merge pull request #1151 from sgmap/revert-destroy-procedure-deletion
...
Revert "ProcedureController: remove unused destroy method"
2017-12-21 19:07:36 +01:00
Mathieu Magnin
142f01d1bb
Revert "ProcedureController: remove unused destroy method" (Sentry : #2149 )
...
This reverts commit 6ca6669144
2017-12-21 18:33:42 +01:00
gregoirenovel
5c91ed4b46
Merge pull request #1146 from sgmap/fix-processing
...
Fix processing
2017-12-21 17:53:08 +01:00
gregoirenovel
a55463c164
Remove the dossier number from the dossier processing popover
...
- One popup_title wasn’t written so that its
combination with the dossier number made sense
- The number is already visible on the page
- The number is not that important to make a
decision (the context it adds does not have
so much value)
2017-12-21 17:42:53 +01:00
gregoirenovel
85a01a4638
Fix typos and unify the wording for dossier processing
2017-12-21 17:42:53 +01:00
gregoirenovel
d45724c1af
Merge pull request #1125 from sgmap/fix-1011
...
[Fix #1011 ] Change the “Enregistrer un brouillon” button behaviour
2017-12-21 16:46:00 +01:00
gregoirenovel
8c1eeb9f25
[ Fix #1011 ] Change the “Enregistrer un brouillon” button behaviour
...
And add the “Voir mes brouillons et dossiers”
button
2017-12-21 15:05:13 +01:00
gregoirenovel
8c96f15fa5
Merge pull request #1126 from sgmap/fix-525
...
[Fix #525 ] Improve the wording of the attestation template footer label
2017-12-20 20:17:40 +01:00
gregoirenovel
84b05a348e
[ Fix #525 ] Improve the wording of the attestation template footer label
2017-12-20 19:57:31 +01:00
LeSim
35dba93469
Merge pull request #1137 from sgmap/update_nokogiri
...
Gemfile: update Nokogiri and stuff around
2017-12-20 14:14:24 +01:00
simon lehericey
c282165e97
Gemfile: update Nokogiri and stuff around
2017-12-20 11:15:36 +01:00
gregoirenovel
f326186186
Merge branch 'dev'
2017-12-19 16:56:46 +01:00
gregoirenovel
27d7df6d09
Merge pull request #1134 from sgmap/fix-print
...
Forgot to replace some commentaires/messages paths in #1122
2017-12-19 16:56:18 +01:00
gregoirenovel
280d4af5ee
Forgot to replace some commentaires/messages paths in #1122
2017-12-19 16:50:31 +01:00
gregoirenovel
045d648968
Merge pull request #1132 from sgmap/space_out_select_label
...
Space out select labels
2017-12-19 14:02:41 +01:00
Mathieu Magnin
77c28144cb
Space out select labels
2017-12-19 13:55:02 +01:00
gregoirenovel
47e4039a2a
Merge branch 'dev'
2017-12-19 13:53:34 +01:00
gregoirenovel
a5bce3b72a
Merge pull request #1131 from sgmap/improve-circle-ci-build
...
Fix missing updated Gemfile.lock
2017-12-19 13:35:08 +01:00
Mathieu Magnin
a10635b4c4
Fix missing updated Gemfile.lock
2017-12-19 13:20:17 +01:00
gregoirenovel
bab4b4711a
Merge pull request #1122 from sgmap/messagerie
...
Commentaire -> message
2017-12-19 13:12:40 +01:00
gregoirenovel
df08f32de7
Merge pull request #1128 from sgmap/fix-1123-remove-beta
...
[Fix #1123 ] remove beta
2017-12-19 11:56:51 +01:00
gregoirenovel
2b294e2a95
[ Fix #1123 ] Remove the beta banner in production
2017-12-19 11:48:21 +01:00
gregoirenovel
63b31818f8
Merge pull request #1117 from sgmap/improve-circle-ci-build
...
Improve circle ci build
2017-12-19 11:48:12 +01:00
Mathieu Magnin
820fd0a412
Deploy job is only run on dev and master
2017-12-19 11:40:47 +01:00
gregoirenovel
a28bf91356
Commentaire -> message
2017-12-18 14:20:41 +01:00
gregoirenovel
52a79a2123
Merge pull request #1111 from sgmap/partial
...
Partial
2017-12-15 19:04:18 +01:00
gregoirenovel
046e1cf8f3
Mutualize some code in an avis form partial
2017-12-15 18:54:55 +01:00
gregoirenovel
ec9758a946
Mutualize some code code into a messagerie partial
2017-12-15 18:37:44 +01:00
gregoirenovel
0c995b63cf
Move the avis list partial in the shared folder
2017-12-15 18:37:44 +01:00
gregoirenovel
e4f7f20698
Mutualize some accompagnateur show template code in a partial
2017-12-15 18:37:44 +01:00
gregoirenovel
60c845986c
Remove some unused locals in the champs partial inclusions
2017-12-15 18:37:44 +01:00
gregoirenovel
0a185fb76b
Remove useless ids in the new Avis templates
2017-12-15 18:37:44 +01:00
gregoirenovel
6e4ea935f7
Merge branch 'dev'
2017-12-15 18:37:28 +01:00
