Xavier J
|
e4b0638762
|
Merge branch 'archive_dossier' into develop
|
2017-02-13 13:41:50 +01:00 |
|
Xavier J
|
807a8112e3
|
Fix some features tests (DONE)
|
2017-02-13 13:15:37 +01:00 |
|
Xavier J
|
de4bddee93
|
delete bin
|
2017-02-13 12:16:48 +01:00 |
|
Xavier J
|
306650ee89
|
Fix some features tests
|
2017-02-13 11:57:35 +01:00 |
|
Xavier J
|
bc918446f2
|
Fix some tests
|
2017-02-10 12:48:49 +01:00 |
|
Mathieu Magnin
|
5613b896b1
|
Gestionnaire can archive dossier
|
2017-02-08 17:35:28 +01:00 |
|
Mathieu Magnin
|
3502e046e2
|
Merge branch 'develop' into staging
|
2017-02-08 15:33:29 +01:00 |
|
Mathieu Magnin
|
82546a3ad4
|
Fix merge error
|
2017-02-08 15:32:49 +01:00 |
|
Xavier J
|
812b8f7f27
|
Merge develop into staging
|
2017-02-07 18:28:22 +01:00 |
|
Mathieu Magnin
|
8ba8135e6b
|
Allow blank for lien_demarche
|
2017-02-07 18:12:25 +01:00 |
|
Mathieu Magnin
|
1bd66b6a9e
|
Add tests and lien_demarche in serialize
|
2017-02-07 18:12:25 +01:00 |
|
Mathieu Magnin
|
f15e9ec7da
|
In dev mode, demo buttons link to localhost
|
2017-02-07 18:12:25 +01:00 |
|
Mathieu Magnin
|
566fd8bc74
|
Add lien demarche to type de piece justificative
|
2017-02-07 18:12:25 +01:00 |
|
Xavier J
|
333ea9a610
|
Merge commit '99248a75a02710899e7ee2ecbcb3b304620cb721' into develop
|
2017-02-07 17:54:21 +01:00 |
|
Xavier J
|
5edd16c30f
|
Fix indentation
|
2017-02-07 17:52:56 +01:00 |
|
Xavier J
|
7cd08ec3f9
|
Merge branch 'develop' into print_css_for_dossier_show
# Conflicts:
# app/views/dossiers/_messagerie.html.haml
|
2017-02-07 17:38:02 +01:00 |
|
Mathieu Magnin
|
aa88fad777
|
Sync password after login
|
2017-02-07 16:56:21 +01:00 |
|
Mathieu Magnin
|
6444aa5be6
|
Use has_one instead of scope
|
2017-02-06 16:52:57 +01:00 |
|
Mathieu Magnin
|
4e493e6c83
|
Merge branch 'staging'
|
2017-02-02 12:09:51 +01:00 |
|
Mathieu Magnin
|
9806708238
|
Merge branch 'develop' into staging
|
2017-02-01 18:06:17 +01:00 |
|
Mathieu Magnin
|
749baedf43
|
Replace administration with services instructeurs
|
2017-02-01 18:05:58 +01:00 |
|
Mathieu Magnin
|
1d911d8bc8
|
Merge branch 'develop' into staging
|
2017-02-01 17:19:40 +01:00 |
|
Mathieu Magnin
|
6bf3b9edf8
|
Fix test : do not send notification if commentaire is not saved
|
2017-02-01 17:16:08 +01:00 |
|
Mathieu Magnin
|
e99746639b
|
Merge branch 'send_user_notification_when_invite_send_a_message' into develop
|
2017-02-01 17:01:34 +01:00 |
|
Mathieu Magnin
|
91bd058106
|
Some fixes after review
|
2017-02-01 15:58:56 +01:00 |
|
Mathieu Magnin
|
34d05e4d9e
|
Improve the print css for the dossier/show
|
2017-02-01 14:24:24 +01:00 |
|
Mathieu Magnin
|
9266cf0feb
|
Disable scrollwheel zoom on map
|
2017-02-01 10:31:45 +01:00 |
|
Mathieu Magnin
|
2182b978e7
|
Merge branch 'staging'
|
2017-02-01 09:56:28 +01:00 |
|
Mathieu Magnin
|
b980dfa8eb
|
Merge branch 'develop' into staging
|
2017-01-31 18:08:15 +01:00 |
|
Mathieu Magnin
|
11a7a64bd8
|
Merge branch 'fix_wording' into develop
|
2017-01-31 18:02:41 +01:00 |
|
Mathieu Magnin
|
ef9012cd82
|
Add lien cerfa vierge in the modification popup
|
2017-01-31 17:58:44 +01:00 |
|
Mathieu Magnin
|
aea1816da1
|
add mailcatcher config in dev
|
2017-01-31 17:22:03 +01:00 |
|
Mathieu Magnin
|
37d31fae7b
|
Rename formulaire to formulaire de demande
|
2017-01-31 11:45:29 +01:00 |
|
Mathieu Magnin
|
38e8acf285
|
Change some wordings and clean some templates
|
2017-01-31 10:46:20 +01:00 |
|
Mathieu Magnin
|
83945b3366
|
add mailcatcher comment
|
2017-01-30 15:21:47 +01:00 |
|
Mathieu Magnin
|
c7934b2f97
|
Send a mail to usager if somebody else wrote a new commentaire on his dossier
|
2017-01-30 15:17:45 +01:00 |
|
Mathieu Magnin
|
99248a75a0
|
Add accompagnateurs emails in export
|
2017-01-26 17:54:04 +01:00 |
|
Mathieu Magnin
|
fee44d421f
|
Merge branch 'staging'
|
2017-01-26 15:17:03 +01:00 |
|
Mathieu Magnin
|
b40193e7b5
|
New customizable mail : mail_validated, new balise --lien_dossier--
|
2017-01-26 12:12:52 +01:00 |
|
Mathieu Magnin
|
83616f77db
|
Fix tests
|
2017-01-24 17:14:51 +01:00 |
|
Mathieu Magnin
|
2bc5ee88f7
|
Change controller name according to model name, add simple_form
|
2017-01-24 15:53:42 +01:00 |
|
Mathieu Magnin
|
482ca2a317
|
Add a mail_template decorator
|
2017-01-24 11:58:09 +01:00 |
|
Mathieu Magnin
|
0e5c90cb0c
|
Real index and edit for mail_templates
|
2017-01-24 10:19:42 +01:00 |
|
Mathieu Magnin
|
6bddf2fb5b
|
Merge branch 'develop' into staging
|
2017-01-23 17:26:17 +01:00 |
|
JC
|
4880101202
|
Fixing nomethoderror for opensimplif
|
2017-01-23 17:18:57 +01:00 |
|
Mathieu Magnin
|
7e24adbca0
|
Add mail preview and small fix
|
2017-01-23 15:49:19 +01:00 |
|
Mathieu Magnin
|
29de9b0b55
|
Simplify mailers development with mailcatcher and previews
|
2017-01-23 15:41:09 +01:00 |
|
Mathieu Magnin
|
f8c73cc368
|
Merge branch 'staging'
|
2017-01-19 15:56:51 +01:00 |
|
Mathieu Magnin
|
097fa66e7c
|
Merge branch 'develop' into staging
|
2017-01-19 13:37:55 +01:00 |
|
Mathieu Magnin
|
293e24e20e
|
Merge pull request #11 from sgmap/fix_typos
Fix typos
|
2017-01-19 13:32:05 +01:00 |
|