Commit graph

4759 commits

Author SHA1 Message Date
Simon Lehericey
11c010859c [fix 363] Dossier: remove next_step! action = update 2017-12-15 15:43:30 +01:00
Simon Lehericey
629cccbf27 [fix 363] Dossier: remove next_step! action = comment 2017-12-15 15:43:30 +01:00
gregoirenovel
4adbb09e9c
Merge pull request #1113 from sgmap/messagerie-style
Improve the style of the messagerie form
2017-12-15 14:54:48 +01:00
gregoirenovel
fb392d87c9 Improve the style of the messagerie form
Reduce the space between the messages and the
new message textarea
2017-12-15 14:42:41 +01:00
LeSim
901b5286b5 Merge branch 'dev' 2017-12-15 13:12:19 +01:00
gregoirenovel
58ce66f457
Merge pull request #1038 from sgmap/fix_504_translate_dossier_state_in_french
Fix 504 translate dossier state in french
2017-12-15 12:55:07 +01:00
LeSim
ee12644e56 Rake: french translation dossier : add revert task 2017-12-15 12:10:54 +01:00
Simon Lehericey
c83552f423 [fix #504] Dossier: without_continuation -> sans_suite 2017-12-15 12:10:54 +01:00
Simon Lehericey
2be9b8d2ba [fix #504] Dossier: refused -> refuse 2017-12-15 12:10:54 +01:00
Simon Lehericey
a13256f73d [fix #504] Dossier: closed -> accepte 2017-12-15 12:10:54 +01:00
LeSim
3dda27b281 [fix #504] Dossier: received -> en_instruction 2017-12-15 12:10:54 +01:00
Simon Lehericey
72bae2c374 [fix #504] Dossier: draft -> brouillon 2017-12-15 11:52:09 +01:00
LeSim
56545933a9 [fix #504] Dossier: initiated -> en_construction
The change must not impact the api
2017-12-15 11:52:09 +01:00
Mathieu Magnin
1330497742 Merge branch 'dev' 2017-12-15 11:41:53 +01:00
Mathieu Magnin
461dd9e843
Merge pull request #1106 from sgmap/test-print
Basic test on print view
2017-12-15 11:25:36 +01:00
Mathieu Magnin
09750491ca Basic test on print view 2017-12-15 11:06:49 +01:00
Mathieu Magnin
ae0a22408b
Merge pull request #1107 from sgmap/improve-messagerie-ui
Improve messagerie readability
2017-12-15 11:06:24 +01:00
Mathieu Magnin
5c46db3b3d Improve messagerie readability 2017-12-15 11:01:48 +01:00
gregoirenovel
410a12b966
Merge pull request #1104 from sgmap/template-refactor
Mutualize a duplicated render instruction
2017-12-15 10:58:40 +01:00
gregoirenovel
9766a48d64 Mutualize a duplicated render instruction 2017-12-15 10:50:58 +01:00
gregoirenovel
8be550f869
Merge pull request #1108 from sgmap/notify_on_avis_tab
If answer is missing on avis, notify on avis tab
2017-12-15 10:50:03 +01:00
Mathieu Magnin
3927e5ebf9 If answer is missing on avis, notify on avis tab 2017-12-15 10:43:36 +01:00
gregoirenovel
3b73a781cc
Merge pull request #1105 from sgmap/improve-ui
Improve ui
2017-12-15 10:42:21 +01:00
gregoirenovel
2def3ecd20 Annotations privées look odd in a card 2017-12-14 18:32:48 +01:00
gregoirenovel
95ad67a9ad Add more spacing below the accompagnateur-header
So that the design feels less cramped
2017-12-14 18:32:48 +01:00
gregoirenovel
64f9f087a0 Add some spacing to tab paragraphs and lists
Otherwise the personnes impliquées tab looks odd
2017-12-14 18:32:48 +01:00
gregoirenovel
9ec61a6a73 Remove the featured styling on the annotations privées tab content 2017-12-14 18:32:48 +01:00
gregoirenovel
6cc81db025 Remove a useless title
We do not repeat the tab title in the tab
2017-12-14 18:32:48 +01:00
Frederic Merizen
11b58fbb0b
Merge pull request #1101 from sgmap/fix-866-tag_unbreakable_space
[Fix #866] Allow use of non-breaking spaces in balise in attestation template
2017-12-14 18:27:57 +01:00
Frederic Merizen
94f1a1fa0c [Fix #866] Allow use of non-breaking spaces in balise in attestation template 2017-12-14 17:22:21 +00:00
gregoirenovel
83dc3d738e
Merge pull request #1085 from sgmap/fix-1041
Fix #1041
2017-12-14 17:02:10 +01:00
gregoirenovel
c16ca6adb1 [Fix #1041] Use the tab-title style for tab titles 2017-12-14 16:39:41 +01:00
gregoirenovel
4f0e6ae467 Use the tab-title class instead of an unknown class 2017-12-14 16:39:41 +01:00
gregoirenovel
191a5a1dee Mutualize some CSS into a class 2017-12-14 16:39:41 +01:00
gregoirenovel
b2c8a32fcd Rename accompagneur-title to page-title 2017-12-14 16:39:41 +01:00
gregoirenovel
7cad0c45b8 Merge branch 'dev' 2017-12-14 16:16:21 +01:00
gregoirenovel
4185ef2f04
Merge pull request #1103 from sgmap/fix-notif-crasher
Add missing locals to partials called in the print template
2017-12-14 16:07:35 +01:00
gregoirenovel
13d8d4bfd4 Add missing locals to partials called in the print template 2017-12-14 15:47:40 +01:00
Mathieu Magnin
29d6aceb77 Merge branch 'dev' 2017-12-14 15:23:31 +01:00
Mathieu Magnin
22d77b5ab4
Merge pull request #1062 from sgmap/fix-1016
Fix 1016 : Notifications dans les onglets
2017-12-14 14:14:51 +01:00
Mathieu Magnin
7d668315db [Fix #1016] display notifications for annotations privées 2017-12-14 13:57:20 +01:00
Mathieu Magnin
c3e7e39947 [Fix #1016] display notifications for avis 2017-12-14 13:57:20 +01:00
Mathieu Magnin
8e67e5c057 [Fix #1016] display notifications for new messages 2017-12-14 13:57:19 +01:00
Mathieu Magnin
5474ff8bb4 [Fix #1016] display notifications on PJ 2017-12-14 13:57:19 +01:00
Mathieu Magnin
c6be745067 [Fix #1016] display notifications for champs publics 2017-12-14 13:57:15 +01:00
gregoirenovel
98a3b9daea Merge branch 'dev' 2017-12-14 13:42:12 +01:00
LeSim
dfbd52c7a0
Merge pull request #1094 from sgmap/fix_1067_avis_access
[fix #1067][fix #1030] AvisController inherit from GestionnaireContro…
2017-12-14 11:55:34 +01:00
LeSim
c3b4e3f964 [fix #1067, fix #1030] AvisController inherit from GestionnaireController
Should not break anything as avis controller already supposed a gestionnaire is logged in.
2017-12-14 11:43:20 +01:00
Mathieu Magnin
feb1c927a8
Merge pull request #1092 from sgmap/fix-sentry-2139
Fix sentry issue #2139 when published_at is nil
2017-12-14 11:13:12 +01:00
Mathieu Magnin
d901852e09 Fix sentry issue #2139 when published_at is nil 2017-12-14 10:45:17 +01:00