Commit graph

1836 commits

Author SHA1 Message Date
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
Xavier J
18a0cbd296 Merge branch 'develop' into staging 2017-01-10 17:35:05 +01:00
Xavier J
a6b10ba2df Active protect on change dossier state tool with admin email verification 2017-01-10 17:34:55 +01:00
Xavier J
7c8e28d1da Merge branch 'staging' 2017-01-10 17:30:05 +01:00
Xavier J
320037ed3f Merge branch 'develop' into staging 2017-01-10 17:29:50 +01:00
Xavier J
bc71754e87 Add tool change dossier state 2017-01-10 17:29:38 +01:00
Xavier J
6d2d303883 Merge branch 'staging' 2017-01-10 16:25:27 +01:00
Xavier J
61fc0072e4 Merge branch 'develop' into staging 2017-01-10 16:25:15 +01:00
Xavier J
04ee25dc7d Fix bug post commentaire invite 2017-01-10 16:25:05 +01:00
Xavier J
7bf02af586 Merge branch 'staging' 2017-01-10 15:28:01 +01:00
Xavier J
56c15850b9 Merge branch 'develop' into staging 2017-01-10 15:27:48 +01:00
Xavier J
8f5ad1af35 Fix bug procedure_path does not exist 2017-01-10 15:27:40 +01:00
Xavier J
a0b7ddedeb Merge branch 'staging' 2017-01-10 15:04:43 +01:00
Xavier J
e23f83d758 Merge branch 'develop' into staging 2017-01-10 15:04:21 +01:00
Xavier J
12af46a22a Fix invite dossier validated recapitulative show 2017-01-10 15:04:13 +01:00
Xavier J
083b261d21 Merge branch 'staging' 2017-01-10 11:04:26 +01:00
Xavier J
f538cd7ae8 Merge branch 'develop' into staging 2017-01-10 11:03:22 +01:00
Xavier J
672ad55651 Fix FranceConnect connexion routing 2017-01-10 11:03:12 +01:00
Xavier J
270dc553ff Merge branch 'staging' 2017-01-10 10:37:28 +01:00
Xavier J
7bfbb6b18a Merge branch 'develop' into staging 2017-01-10 10:37:15 +01:00
Xavier J
489b533941 Fix deploy 2017-01-09 21:45:08 +01:00
Xavier J
23df8a2348 - Ajust TPS for OpenSimplif
- Create /simplifcations routes for OpenSimplifController
2017-01-09 17:12:11 +01:00
Xavier J
63e3f29770 Merge branch 'staging' 2017-01-09 12:27:07 +01:00
Xavier J
b48477905c Merge branch 'develop' into staging 2017-01-09 12:26:53 +01:00
Xavier J
29c7c8f498 Fix bug @liste sélection in DossierListGestionnaireService 2017-01-09 12:26:41 +01:00
Xavier J
a039e52f16 Merge branch 'staging' 2017-01-09 12:01:05 +01:00
Xavier J
7ed64fc88a Merge branch 'develop' into staging 2017-01-09 12:00:51 +01:00
Xavier J
32378405ed Fix smart listing usage with new admin list presentation 2017-01-09 12:00:39 +01:00
Xavier J
2e7d9fd1d8 Merge branch 'staging' 2017-01-05 19:08:38 +01:00
Xavier J
57d0f808d9 Merge branch 'develop' into staging 2017-01-05 19:07:12 +01:00
Xavier J
c815ec5e82 Add tab for follow dossier in gestionnaire dashboard 2017-01-05 19:07:01 +01:00
Xavier J
04dc45e83c Merge branch 'staging' 2017-01-05 18:04:13 +01:00
Xavier J
e128d5cd9b Merge branch 'develop' into staging 2017-01-05 18:02:02 +01:00
Xavier J
ab02fe48c3 Force state dossier in files lists on gestionnaire board 2017-01-05 18:01:53 +01:00
Xavier J
f5f8451203 Merge branch 'staging' 2017-01-05 12:44:36 +01:00
Xavier J
f91ef021be Merge branch 'develop' into staging 2017-01-05 12:44:24 +01:00