Commit graph

4089 commits

Author SHA1 Message Date
gregoirenovel
d563366ba7 Merge pull request #235 from sgmap/fix-204
[Fix #204] Add the date_de_decision tag
2017-05-04 16:21:06 +02:00
gregoirenovel
849ab5191a [Fix #204] Add the date_de_decision tag in relevant email templates 2017-05-04 16:17:59 +02:00
gregoirenovel
2582b44f07 [Fix #204] Add the date_de_decision tag 2017-05-04 16:17:53 +02:00
gregoirenovel
3bd5e32dff Add a system to restrain the email templates tags to specific templates 2017-05-04 16:17:39 +02:00
gregoirenovel
30cf475485 Add missing brackets in mail_template_concern.rb 2017-05-04 16:17:39 +02:00
gregoirenovel
43ae28de87 Make the email templates tags table occupy the whole width available
It improves the content formatting (no more ugly
line breaks splitting a tag on several lines)
2017-05-04 16:17:38 +02:00
gregoirenovel
f389bbeb53 Fix indentation in mail_template_concern.rb 2017-05-04 16:17:38 +02:00
gregoirenovel
ba5a649f6b Merge pull request #156 from sgmap/spelling
Fix some spelling mistakes
2017-05-04 16:16:46 +02:00
gregoirenovel
f3343f593f Fix some spelling mistakes 2017-05-04 16:15:51 +02:00
gregoirenovel
01160dfbad Merge pull request #247 from sgmap/readme
Readme additions
2017-05-04 16:15:27 +02:00
gregoirenovel
1691ce1899 Add a missing lint command to README.md 2017-05-04 16:15:04 +02:00
gregoirenovel
70f7175471 Add a Launching section to README.md 2017-05-04 16:15:04 +02:00
gregoirenovel
6e1818bb79 Add missing dependencies to README.md 2017-05-04 16:15:04 +02:00
gregoirenovel
a7d45313f8 Merge pull request #248 from sgmap/delete-useless-file
Remove an unused file
2017-05-04 16:14:45 +02:00
gregoirenovel
53e5416627 Remove an unused file 2017-05-04 16:01:41 +02:00
LeSim
21bacdf880 Merge pull request #246 from sgmap/gitignore_procfile
Gitignore: add Procfile.dev to gitignore
2017-05-04 15:54:42 +02:00
Simon Lehericey
4d6a3653ed Gitignore: add Procfile.dev to gitignore 2017-05-04 15:54:19 +02:00
LeSim
48d6853086 Merge pull request #241 from sgmap/add_translation_for_gestionnaire
Local: add french translation for gestionnaire too_short password
2017-05-04 15:53:13 +02:00
Simon Lehericey
0384b5d0ae Local: add french translation for gestionnaire too_short password 2017-05-04 15:52:51 +02:00
gregoirenovel
334dcb09a7 Merge pull request #155 from sgmap/vocabulary
Vocabulary
2017-05-04 11:38:49 +02:00
gregoirenovel
402f44c5fd Champs privés -> Annotations privées 2017-05-04 11:35:23 +02:00
gregoirenovel
77dae0462b Utilisateur -> Usager 2017-05-04 11:35:23 +02:00
gregoirenovel
4303dcef2c Organisation -> Organisme 2017-05-04 11:35:22 +02:00
gregoirenovel
d3a84eb20a Démarche -> Procédure 2017-05-04 11:33:26 +02:00
gregoirenovel
2543e37789 Merge pull request #151 from sgmap/test-fix
Test fix
2017-05-04 11:31:30 +02:00
gregoirenovel
fd07a88ed6 Add a missing test to the _render_list_champs template’s test 2017-05-04 11:31:10 +02:00
gregoirenovel
4ce6c92394 Reformat the _render_list_champs template test 2017-05-04 11:31:10 +02:00
gregoirenovel
6e8ee504a9 Merge pull request #165 from sgmap/fix-161
[Fix #161] Remove incorrect commas from Dossier#text_summary
2017-05-04 11:27:07 +02:00
gregoirenovel
988947696e [Fix #161] Remove incorrect commas from Dossier#text_summary 2017-05-04 11:25:33 +02:00
gregoirenovel
24b80e70db Merge pull request #243 from sgmap/fix_stats_graphs_missing_on_load
Fix #239, (refresh is needed to load charts)
2017-05-04 09:22:57 +02:00
Mathieu Magnin
b6e1526f89 Fix #239, (refresh is needed to load charts) 2017-05-03 18:48:27 +02:00
gregoirenovel
14697be576 Merge branch 'staging' 2017-05-03 10:43:45 +02:00
gregoirenovel
6d3d779ba8 Merge branch 'develop' into staging 2017-05-03 10:38:16 +02:00
gregoirenovel
a8b5088152 Merge pull request #231 from sgmap/fix-162
[Fix #162] Deny dossier access for an unauthorized accompagnateur
2017-05-03 10:37:29 +02:00
gregoirenovel
eff9e556e9 [Fix #162] Deny dossier access for an unauthorized accompagnateur 2017-05-03 10:28:29 +02:00
gregoirenovel
408cefc809 Merge pull request #153 from sgmap/haml-clean
Haml clean
2017-05-02 10:31:57 +02:00
gregoirenovel
0e746c7eec Merge branch 'staging' 2017-05-02 10:11:51 +02:00
gregoirenovel
f7d6f013f1 Merge branch 'develop' into staging 2017-04-27 16:59:32 +02:00
gregoirenovel
f310f672b6 Extract class attributes from HAML tag attributes 2017-04-26 17:22:31 +02:00
gregoirenovel
7ddcb9aedc Extract id attributes from HAML tag attributes 2017-04-26 17:22:30 +02:00
gregoirenovel
e9d32541ce Detect implicit divs with haml-lint 2017-04-26 17:01:45 +02:00
gregoirenovel
51daa2f498 Use implicit div tags instead of explicit 2017-04-26 17:01:45 +02:00
Mathieu Magnin
8fdb61ae54 Merge pull request #140 from sgmap/remove_facade_data_view
Remove @facade_data_view from left_panel view
2017-04-26 17:00:40 +02:00
Mathieu Magnin
6ef6a66c3f Remove @facade_data_view from left_panel view 2017-04-26 16:55:22 +02:00
gregoirenovel
f1530d9a05 Merge pull request #150 from sgmap/fix-99
[Fix #99] Improve the info message in _dossier_link.html.haml
2017-04-26 16:51:37 +02:00
gregoirenovel
f58a626648 [Fix #99] Improve the info message in _dossier_link.html.haml 2017-04-26 16:47:38 +02:00
gregoirenovel
d596dbfd1b Merge pull request #148 from sgmap/fix-133
[Fix #133] Improve the linked dossier informations displayed
2017-04-26 16:13:31 +02:00
gregoirenovel
a6d3ea8536 [Fix #133] Improve the linked dossier informations displayed 2017-04-26 15:59:18 +02:00
gregoirenovel
f5c5ad532d Add Dossier#text_summary 2017-04-26 15:59:17 +02:00
gregoirenovel
c0fd56ea8e Merge pull request #142 from sgmap/fix-132
[Fix #132] Show the dossier link in the dossier detail for Users
2017-04-26 15:48:56 +02:00