Commit graph

11037 commits

Author SHA1 Message Date
Xavier J
bf430ebff0 Merge branch 'staging' 2016-09-19 17:09:32 +02:00
Xavier J
0ecccc8ed5 Merge branch 'develop' into staging 2016-09-19 17:06:21 +02:00
Xavier J
6bd2cfb935 Disabled @latest_release for Github 2016-09-19 17:06:09 +02:00
Xavier J
17f368b7cb Merge branch 'develop' into staging 2016-09-19 17:02:37 +02:00
Xavier J
b86d4ced0d Disabled @latest_release for Github 2016-09-19 17:02:29 +02:00
Xavier J
40a45d4da6 Merge branch 'develop' into staging 2016-09-19 16:59:22 +02:00
Xavier J
d3ed39597e Fix bug @latest_release for Github 2016-09-19 16:59:07 +02:00
Xavier J
a0dd591260 Merge branch 'staging'
# Conflicts:
#	app/controllers/admin/procedures_controller.rb
#	app/views/admin/procedures/_informations.html.haml
#	app/views/cgu/index.html.haml
#	app/views/dossiers/etapes/_etape1.html.haml
#	config/routes.rb
#	db/schema.rb
2016-09-16 18:12:28 +02:00
Xavier J
8c5875a36c Merge branch 'develop' into staging 2016-09-16 17:19:51 +02:00
Xavier J
5fb678e53b Fix test 2016-09-16 17:18:29 +02:00
Xavier J
bd89688346 Fix test INSEE v2 get etablissement view 2016-09-16 17:08:50 +02:00
Xavier J
9332c0f6ed Fix brakeman test 2016-09-16 16:29:34 +02:00
Xavier J
ccd9c0898d Fix test with cloud storage enabled 2016-09-16 15:40:30 +02:00
Xavier J
cd4848a916 Update Gems Devise and Uglifier for security alert 2016-09-14 18:34:19 +02:00
Xavier J
fdca96028d Merge branch 'develop' into staging 2016-09-14 17:05:27 +02:00
Xavier J
3014c4c539 Change word "Instruction" to "Examen" 2016-09-14 16:57:51 +02:00
Xavier J
36cc7c0dbf Merge branch 'develop' into staging 2016-09-14 16:36:42 +02:00
Xavier J
0c9fea1c14 User can invite other user to edit his dossier 2016-09-14 16:36:01 +02:00
Xavier J
60b94fc41b Specialize Invite object 2016-09-13 15:54:26 +02:00
Xavier J
0ac23f6d96 User can invite other User 2016-09-13 12:17:56 +02:00
Xavier J
e9d4685aef Force use https for generate route 2016-09-12 17:30:25 +02:00
Xavier J
7819e257c7 Merge branch 'develop' into staging 2016-09-09 17:44:23 +02:00
Xavier J
4a336b8af7 Config devise session timeout 2016-09-09 17:44:00 +02:00
Xavier J
969e5f020a Fix bug clonage private fields 2016-09-09 17:39:56 +02:00
Xavier J
f6ab83f8bd gestionnaire can be filter be procedure on dossier list tab 2016-09-09 17:29:21 +02:00
Xavier J
30acd9bb3e A cookie file keep the last navigation tab for user and gestionnaire 2016-09-09 16:20:07 +02:00
Xavier J
c5035ca81e When gestionnaire follow an initiated dossier, this paste his state at 'updated' 2016-09-09 15:55:03 +02:00
Xavier J
955c984a88 Gestionnaire can add specific attr on dossier list by procedure 2016-09-09 15:05:46 +02:00
Xavier J
62a0b84048 Filter by procedure is activated on route /backoffice/dossiers/procedure/:id 2016-09-08 16:21:54 +02:00
Xavier J
bb19982011 Change onglet url to dynamic gestion 2016-09-06 14:07:07 +02:00
Xavier J
d5ad256919 create route and controller to filter dossier view by procedure 2016-09-06 11:07:26 +02:00
Guillaume Lazzara
638454a2e4 Merge branch 'develop' into staging 2016-09-02 17:11:59 +02:00
Guillaume Lazzara
6a6ac7872a Force deep copy of procedure logo 2016-09-02 17:11:30 +02:00
Xavier J
cd82f7b406 Merge branch 'develop' into staging 2016-09-01 14:39:44 +02:00
Xavier J
1c5cd471cd Externalize in config file SIADE API URL. 2016-09-01 12:09:44 +02:00
Xavier J
c64a4ef61f Merge branch 'develop' into staging 2016-09-01 11:00:19 +02:00
Xavier J
a48299353e Fix html interpretation in ReceivedMail 2016-09-01 11:00:06 +02:00
Xavier J
69c45cfb99 Merge branch 'develop' into staging 2016-09-01 10:43:57 +02:00
Xavier J
b56883db16 Clone mail_templates where clone procedure 2016-09-01 10:43:49 +02:00
Xavier J
7a81b18d66 Initiated all Procedure mail_received 2016-09-01 10:40:20 +02:00
Xavier J
94fd350f83 Merge branch 'develop' into staging 2016-09-01 10:27:33 +02:00
Xavier J
f03733f3ff Mail for receive dossier is now send. 2016-09-01 10:27:22 +02:00
Xavier J
12ebab66cc Administrateur can be param the acknowledgement of delivery mail object and body. 2016-08-31 16:07:11 +02:00
Xavier J
eb250e7cec Ajust landing page 2016-08-31 10:53:41 +02:00
Xavier J
cc5b643066 Merge branch 'develop' into staging 2016-08-30 14:14:30 +02:00
Xavier J
d438e9a329 Ajust landing page 2016-08-30 14:14:18 +02:00
Xavier J
877466c33a Update CGU 2016-08-30 13:31:22 +02:00
Xavier J
681d82b682 Merge branch 'develop' into staging 2016-08-30 13:29:52 +02:00
Xavier J
16c1fe31c1 Update CGU 2016-08-30 13:29:40 +02:00
Xavier J
452d91e0a1 Merge branch 'develop' into staging 2016-08-30 11:44:18 +02:00