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 |
|
Mathieu Magnin
|
c41c36b4d1
|
Fix typo
|
2017-01-19 12:07:55 +01:00 |
|
Mathieu Magnin
|
52bf1d1ea2
|
Fix typos
|
2017-01-19 11:58:38 +01:00 |
|
Mathieu Magnin
|
2e3cb7a861
|
Cleaning HAML
|
2017-01-18 15:34:03 +01:00 |
|
Mathieu Magnin
|
d5e4f45d7d
|
Add xray-rails in dev mode
|
2017-01-18 13:59:14 +01:00 |
|
Mathieu Magnin
|
6c98b7ab1e
|
Merge branch 'develop' into staging
|
2017-01-16 18:23:33 +01:00 |
|
Mathieu Magnin
|
5b99c18b67
|
New bundler version
|
2017-01-16 18:23:10 +01:00 |
|
Mathieu Magnin
|
b4a6aa835e
|
First commit
|
2017-01-16 18:16:35 +01:00 |
|
Xavier J
|
393370aa3e
|
Merge branch 'staging'
|
2017-01-13 11:19:50 +01:00 |
|
Xavier J
|
bfe1d7469d
|
Merge branch 'develop' into staging
|
2017-01-13 11:19:38 +01:00 |
|
Xavier J
|
154e4f3c10
|
Refacto check_invite! after registration for User.
|
2017-01-13 11:19:29 +01:00 |
|
Xavier J
|
4327201527
|
Merge branch 'staging'
|
2017-01-12 17:02:55 +01:00 |
|
Xavier J
|
eeb5c89b13
|
Merge branch 'develop' into staging
|
2017-01-12 17:02:39 +01:00 |
|
Xavier J
|
f5f5ef1a0d
|
Badge count invites by dossiers
|
2017-01-12 17:02:30 +01:00 |
|
Xavier J
|
42359eff15
|
Fix rake tasks
|
2017-01-11 17:36:28 +01:00 |
|
Xavier J
|
cfc178f0dc
|
Merge branch 'staging'
|
2017-01-11 15:25:38 +01:00 |
|
Xavier J
|
2ebd1aec2f
|
Merge branch 'develop' into staging
|
2017-01-11 15:25:25 +01:00 |
|
Xavier J
|
6612e56da2
|
Mask section left panel is user does not have any dossier
|
2017-01-11 15:22:24 +01:00 |
|
Xavier J
|
91c7fc8d68
|
Merge branch 'staging'
|
2017-01-10 17:35:17 +01:00 |
|