Commit graph

7016 commits

Author SHA1 Message Date
JC
23ef3e896a Done with navbar 2016-11-21 15:31:03 +01:00
JC
0db63f33c0 Working on navbar, will put fake content to get css sizes 2016-11-21 15:04:16 +01:00
JC
b62587f9ab Split footer and flash messages in layouts 2016-11-21 14:19:15 +01:00
JC
f5ec476416 New application layout struct for pages 2016-11-21 14:12:59 +01:00
JC
200a99dbae Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-21 10:54:01 +01:00
JC
1fe76b8c3b Add google_analytics partial in layout 2016-11-21 10:53:50 +01:00
Xavier J
e95ba6b56c Merge branch 'develop' into develop_v2 2016-11-21 10:50:25 +01:00
XjulI1
46fa28322e Merge pull request #7 from sgmap/fix-backoffice-search-dossier-by-id
Fix: search dossier by id (backoffice)
2016-11-21 10:40:38 +01:00
Julien Portalier
426fd55f30 Fix: search dossier by id (backoffice) 2016-11-17 19:18:24 +01:00
Xavier J
7fd41d26f7 Change version on README 2016-11-17 17:11:23 +01:00
Xavier J
647eaa4ba8 Merge branch 'develop' into develop_v2
# Conflicts:
#	Gemfile.lock
#	db/schema.rb
2016-11-17 16:55:41 +01:00
Xavier J
d75a53ffae Fix deploy task 2016-11-17 12:35:05 +01:00
Xavier J
8f012e3731 Add analytics 2016-11-17 12:30:39 +01:00
Xavier J
b4b2dafc7b Add reply_to for invite mailer 2016-11-17 12:17:59 +01:00
Xavier J
06f353968f Local open simplif 2016-11-17 11:37:00 +01:00
Xavier J
6e4ddcdbcf Fix test 2016-11-17 11:24:49 +01:00
Xavier J
d144047a50 Fix export data dossiers 2016-11-17 11:13:11 +01:00
XjulI1
926ae9d805 Merge pull request #6 from sgmap/per-champs-comment-flow
Flux de commentaires par champs
2016-11-17 10:52:18 +01:00
Xavier J
893bfaef40 Fix JS 2016-11-17 10:50:28 +01:00
Julien Portalier
8195a57f9c Fix: distinction des commentaires par champ
Les commentaires par champ sont distincts des commentaires généraux
(non attachés à un champ). Ils ne faut donc pas les afficher dans
les commentaires sous le récapitulatif du dossier.
2016-11-16 16:23:43 +01:00
JC
c557038c38 Adding tooltip for dossiers export amount excess (200) 2016-11-16 11:12:04 +01:00
Julien Portalier
96ca5113f7 Flux de commentaires par champs 2016-11-15 18:36:20 +01:00
Xavier J
305410f7a3 Fix Gemfile.lock and tests 2016-11-15 17:20:36 +01:00
JC
23b928f160 Adding limit (200) for dossier exportation 2016-11-15 17:06:40 +01:00
Xavier J
6a261d125a New color for navbar 2016-11-15 14:10:43 +01:00
Xavier J
1420c8425e Fix mina version 2016-11-15 11:45:21 +01:00
Xavier J
c734c1c960 Update deploy.rb with new staging_v2 branch 2016-11-15 11:19:18 +01:00
Xavier J
b3b03a2449 Fix features tests 2016-11-15 11:01:58 +01:00
JC
0ac3c5fc86 Merging develop branch updated 2016-11-15 10:46:33 +01:00
JC
f1b177e0bb Testing only primary dossier attributes for data_with_champs methods 2016-11-15 10:19:47 +01:00
Xavier J
90cfd3eccb Fix Test spec/controllers/api/*.rb 2016-11-15 09:54:17 +01:00
Xavier J
fc289ba7b3 Remove useless spec 2016-11-15 06:02:49 +01:00
Xavier J
be62dea0e0 Fix major .DEPRECATION WARNING for spec/controllers/users/*.rb 2016-11-15 05:54:27 +01:00
Xavier J
cea85f2d49 Fix DEPRECATION WARNING for spec/controllers/users/dossiers/*.rb 2016-11-15 05:36:32 +01:00
Xavier J
5750eb1aa5 Fix major DEPRECATION WARNING for spec/controllers/admin/*.rb 2016-11-15 05:19:30 +01:00
Xavier J
7c74cbc54b Fix major DEPRECATION WARNING for spec/controllers/backoffice/*.rb 2016-11-15 04:50:18 +01:00
Xavier J
da3ef13522 Fix tests spec/controllers/france_connect/*.rb 2016-11-15 04:42:32 +01:00
Xavier J
15e1bef7e4 Fix DEPRECATION WARNING for spec/controllers/gestionnaires/*.rb 2016-11-15 04:29:05 +01:00
Xavier J
0fc81eb0da Fix DEPRECATION WARNING for spec/controllers/ban/*.rb 2016-11-15 04:26:25 +01:00
Xavier J
430d32dfca Fix DEPRECATION WARNING for spec/controllers/*.rb 2016-11-15 04:24:09 +01:00
Xavier J
d9a5eff21d Fix Views test. 2016-11-15 04:12:22 +01:00
Xavier J
213e84b546 Fix DEPRECATION for services 2016-11-15 03:56:26 +01:00
Xavier J
a5a95abf06 Fix test for all Model 2016-11-14 18:36:09 +01:00
Xavier J
bd3df8de22 Fix Devise Helper Controller 2016-11-14 17:50:06 +01:00
JC
a549f95da1 Continue test for data_with_champs 2016-11-14 17:43:34 +01:00
Xavier J
d7fdf22abb First fixed 2016-11-14 17:33:45 +01:00
JC
2f96895bb8 Continue tests for data_with_champs method, and add a convert_specific_values_to_string for array 2016-11-14 17:25:17 +01:00
JC
5aa9c75669 Ordering champs through export method, not through serializer 2016-11-14 16:37:58 +01:00
JC
5c3049d6bd Manualy sort type_de_champ by order_place 2016-11-14 14:39:59 +01:00
Xavier J
ec53f64a64 Fix bug tag received mailer 2016-11-14 11:03:17 +01:00