Commit graph

3408 commits

Author SHA1 Message Date
gregoirenovel
838e110590 Merge branch 'dev' 2017-11-23 09:48:04 +01:00
gregoirenovel
0ae4536369
Merge pull request #981 from sgmap/fix_980
[Fix# 980] Engagement checkbox should be checked sometimes
2017-11-23 09:41:09 +01:00
Mathieu Magnin
8edfdff0fc [Fix#980] Engagement checkbox should be checked sometimes 2017-11-23 09:40:44 +01:00
gregoirenovel
2edcc12126
Merge pull request #977 from sgmap/better_motivation_view
Better motivation view
2017-11-23 09:39:33 +01:00
Simon Lehericey
d9f44e013a [fix #878] change motivation text and display a label if not action is possible 2017-11-23 09:34:19 +01:00
Simon Lehericey
e28b18d978 Dossier: add statut method 2017-11-23 09:34:18 +01:00
Simon Lehericey
f9c2da7a5d Style: change label class form closed to success 2017-11-23 09:34:14 +01:00
gregoirenovel
c8f3b69943
Merge pull request #978 from sgmap/fix-432
[Fix #432] Stop raising a useless exception in get_position
2017-11-22 17:49:52 +01:00
gregoirenovel
1d7e7fc654 [Fix #432] Stop raising a useless exception in get_position
When an accompagnateur, in the old UI, wants to
see a map, this call crashes because he’s not
the owner or invitee on the dossier he’s looking
at, therefore current_user_dossier raises an
exception
2017-11-22 17:49:32 +01:00
gregoirenovel
abe1c3a3ea
Merge pull request #979 from sgmap/fix-871
[Fix #871] Add the date at the end of exported files
2017-11-22 17:48:41 +01:00
gregoirenovel
5361e4e1e9 [Fix #871] Add the date at the end of exported files 2017-11-22 17:27:57 +01:00
gregoirenovel
5193555140 Merge branch 'dev' 2017-11-22 15:17:56 +01:00
gregoirenovel
ef4ca2c29e Merge branch 'dev' 2017-11-22 11:32:51 +01:00
gregoirenovel
847816ea4c
Merge pull request #974 from sgmap/fix-contact-popover
Fix the display of the accompagnateur contact popover
2017-11-22 11:32:02 +01:00
gregoirenovel
339d493602 Fix the display of the accompagnateur contact popover 2017-11-22 11:24:18 +01:00
gregoirenovel
21811037ea
Merge pull request #970 from sgmap/recherche
Singularize the recherche controller
2017-11-22 10:49:10 +01:00
gregoirenovel
c8e62ad095 recherches -> recherche 2017-11-22 10:48:38 +01:00
gregoirenovel
bc8cab7c7c
Merge pull request #968 from sgmap/recherche-title
Add missing title to the recherche page
2017-11-22 10:48:28 +01:00
gregoirenovel
bf4873af0a Add missing title to the recherche page 2017-11-21 18:21:59 +01:00
Simon Lehericey
c27c01530d Merge branch 'dev' 2017-11-21 18:08:48 +01:00
gregoirenovel
4c1295965f
Merge pull request #966 from sgmap/fix-962
[Fix #962] In new UI, add link on “dossier_link” field values
2017-11-21 18:06:29 +01:00
gregoirenovel
303e5285e9 [Fix #962] In new UI, add link on “dossier_link” field values 2017-11-21 18:05:34 +01:00
gregoirenovel
d52726096c
Merge pull request #955 from sgmap/avoid_infinite_redirect_if_procedure_is_deleted
If user_return_to procedure is invalid then remove it from session
2017-11-21 18:01:56 +01:00
Mathieu Magnin
b4b394bf18 If user_return_to procedure is invalid then remove it from session 2017-11-21 17:53:16 +01:00
gregoirenovel
6fcc799c67
Merge pull request #967 from sgmap/add_title_to_page
[fix #445]: add title to pages
2017-11-21 17:53:08 +01:00
Simon Lehericey
a71574b8dd [fix #445]: add title to pages 2017-11-21 17:47:27 +01:00
gregoirenovel
ee06b424bb
Merge pull request #960 from sgmap/fix-896
Fix #896
2017-11-21 17:27:14 +01:00
gregoirenovel
481c38dee2 [Fix #896] Add a visible contact dialog for gestionnaires 2017-11-21 16:49:25 +01:00
gregoirenovel
a46aa83f00 Use a class instead of a tag as a tab link selector 2017-11-21 16:49:25 +01:00
gregoirenovel
3f55bd33e3
Merge pull request #961 from sgmap/css-var
Use CSS variables when possible
2017-11-21 16:48:39 +01:00
gregoirenovel
496087ead9 Use CSS variables when possible 2017-11-21 16:48:13 +01:00
gregoirenovel
399bf7022d
Merge pull request #959 from sgmap/pj-draft-link
Show links to uploaded pieces justificatives in drafts
2017-11-21 16:47:59 +01:00
gregoirenovel
d5954c7423 Show links to uploaded pieces justificatives in drafts 2017-11-21 16:46:43 +01:00
LeSim
7d33c5c1b0
Merge pull request #950 from sgmap/fix_#879_better_fields_display
Fix #879 better fields display
2017-11-21 16:43:52 +01:00
Mathieu Magnin
c85ae89725 Merge branch 'dev' 2017-11-21 10:48:40 +01:00
Simon Lehericey
68ea1ca1bd [fix #879] Civilite: display inline 2017-11-21 10:48:08 +01:00
Simon Lehericey
3dd2b7fd1d [fix #879] Yes_No: use standard order and display inline 2017-11-21 10:48:08 +01:00
Mathieu Magnin
deb3f02903
Merge pull request #956 from sgmap/fix_export_for_yes_no_champ
Fix export for yes_no champs
2017-11-21 10:41:42 +01:00
Mathieu Magnin
7bfafb6fc2 Fix export for yes_no champs 2017-11-21 10:36:24 +01:00
gregoirenovel
e8d7322ee3
Merge pull request #953 from sgmap/rubocop-perf
Enable all the rubicop perf cops
2017-11-21 10:31:43 +01:00
gregoirenovel
379e7b74d6 Enable all the rubicop perf cops 2017-11-21 10:31:16 +01:00
gregoirenovel
b76a7c9975
Merge pull request #952 from sgmap/remove-useless-js
Remove a now useless JS statement
2017-11-21 10:31:06 +01:00
gregoirenovel
8997f57d21 Remove a now useless JS statement
This is now done in init.js
2017-11-21 10:30:50 +01:00
gregoirenovel
d3c2dabb21
Merge pull request #954 from sgmap/fix-multiple-value-display
Fix multiple-selection values display when no value is given
2017-11-21 10:11:21 +01:00
gregoirenovel
899e20ebcc Fix multiple-selection values display when no value is given 2017-11-21 10:03:56 +01:00
Simon Lehericey
62ebd74e07 Merge branch 'dev' 2017-11-20 17:45:27 +01:00
LeSim
c5b678242a
Merge pull request #944 from sgmap/show_new_dossier_first
Show new dossier first
2017-11-20 17:34:09 +01:00
Simon Lehericey
d0cad00940 ProcedurePresentation: change default sort value 2017-11-20 17:22:52 +01:00
Simon Lehericey
2b146a6d62 Notifications: show dossiers with notification in first place 2017-11-20 17:22:52 +01:00
gregoirenovel
8df9462d1a
Merge pull request #951 from sgmap/fix-908
Fix #908
2017-11-20 17:10:30 +01:00