Commit graph

11 commits

Author SHA1 Message Date
Xavier J
647eaa4ba8 Merge branch 'develop' into develop_v2
# Conflicts:
#	Gemfile.lock
#	db/schema.rb
2016-11-17 16:55:41 +01:00
Julien Portalier
96ca5113f7 Flux de commentaires par champs 2016-11-15 18:36:20 +01:00
Guillaume Lazzara
833d7790c2 Add support for remote OVH cloud storage 2016-05-13 16:08:51 +02:00
Xavier J
b15c2bbb2b New feature : User, Guest and Gestionnaire can be upload a document with theirs comments 2016-04-20 16:51:57 +02:00
Xavier J
20a41ef172 Use gem bootstrap-wysihtml5 on textarea 2016-02-18 11:56:54 +01:00
Xavier J
a82899a43e Delete max length on comment area 2016-02-08 19:36:08 +01:00
Xavier J
e2a896d0b0 Gestionnaire can invite an email contact to participate at a dossier 2016-02-08 18:16:18 +01:00
Xavier J
3c18882407 Create facade for dossier into user and gestionnaire views 2015-12-24 15:10:20 +01:00
Xavier J
61b126b0f9 add api_carto on back office and recapitulative page 2015-11-19 16:47:56 +01:00
Xavier J
8693f4194c Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop
Conflicts:
	app/views/users/recapitulatif/show.html.haml
	spec/features/recapitulatif_page/_commentaires_flux_spec.rb
	spec/features/recapitulatif_page/show_page_spec.rb
2015-09-24 10:56:12 +02:00
Tanguy PATTE
5772b99d42 move controller into users folder 2015-09-23 19:20:03 +02:00
Renamed from app/views/recapitulatif/_commentaires_flux.html.haml (Browse further)