Xavier J
|
138b5ac498
|
Merge branch 'develop' into staging
|
2017-02-13 13:52:34 +01:00 |
|
Xavier J
|
c344c99fbb
|
Merge branch 'sync-passwords-on-login' into develop
|
2017-02-13 13:47:36 +01:00 |
|
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
|
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
|
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
|
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
|
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
|
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
|
eeb5c89b13
|
Merge branch 'develop' into staging
|
2017-01-12 17:02:39 +01:00 |
|