Commit graph

13401 commits

Author SHA1 Message Date
JC
570b22c60f Add google_analytics partial in layout 2016-11-23 16:15:00 +01:00
Xavier J
d09a47ae23 First iteration navbar tableau de bord 2016-11-23 15:21:42 +01:00
Xavier J
4d78c9684f Merge branch 'staging' 2016-11-23 11:36:26 +01:00
Xavier J
960eed4f19 Merge branch 'develop' into staging 2016-11-23 11:36:14 +01:00
JC
e35c1f8757 Up limit for export form 200 to 400 2016-11-23 11:31:00 +01:00
JC
37b5e3fc48 Up limit for export form 200 to 400 2016-11-23 11:29:56 +01:00
JC
966febca68 Centering show-block, need to merge css into develop°v2 2016-11-23 11:26:05 +01:00
JC
de9753ae69 Need to anime accordeon, and check if width + margin % is the solution 2016-11-23 10:59:48 +01:00
JC
750d81e70b Working on css for dossier#show body 2016-11-22 17:32:00 +01:00
JC
c5e0f0a780 Extract css for sign_in sign_out from navbar 2016-11-22 16:32:50 +01:00
JC
5ba1c85ca7 Change spec according to layout rendering service 2016-11-22 16:30:35 +01:00
JC
5b61d41030 layouts for dossiers show 2016-11-22 16:10:01 +01:00
JC
4f9bcdd225 Awsome struct to share layouts between controllers and there methods 2016-11-22 16:03:32 +01:00
Xavier J
7faf1705da Add service RenderPartial 2016-11-22 15:17:37 +01:00
JC
55eb8397d2 Fixing footer and push left to center on after wrap 2016-11-22 11:33:08 +01:00
JC
3627a18420 Set navbar options from before_action 2016-11-21 17:30:28 +01:00
JC
e9eeb0b4ba Sacrifice 1 bootstrap col unit to get disconnect preview (under ruban) 2016-11-21 16:57:42 +01:00
JC
3a82725cbd Fix css for download dossiers buttons 2016-11-21 16:49:59 +01:00
JC
ef9adf52cb Loading variables from controller to get several uniq layout to display 2016-11-21 16:45:12 +01:00
JC
2d355bd6a0 Working on left-pannel, include footer after main-container 2016-11-21 16:13:19 +01:00
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
Xavier J
a57ab2a4d3 Merge branch 'staging' 2016-11-21 10:46:43 +01:00
Xavier J
2568a53951 Merge branch 'develop' into staging 2016-11-21 10:46:29 +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
60d9522a65 Merge branch 'staging' 2016-11-17 12:36:13 +01:00
Xavier J
ea47e6cbfe Merge branch 'develop' into staging 2016-11-17 12:35:13 +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
d7ff46879a Merge branch 'staging' 2016-11-17 12:18:23 +01:00
Xavier J
f569cc0d85 Merge branch 'develop' into staging 2016-11-17 12:18:10 +01:00
Xavier J
b4b2dafc7b Add reply_to for invite mailer 2016-11-17 12:17:59 +01:00
Xavier J
ce20c24f69 Merge branch 'staging' 2016-11-17 11:38:20 +01:00
Xavier J
0423ac6c8a Merge branch 'develop' into staging 2016-11-17 11:37:08 +01:00
Xavier J
06f353968f Local open simplif 2016-11-17 11:37:00 +01:00
Xavier J
996d55cffb Merge branch 'develop' into staging 2016-11-17 11:25:27 +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
Xavier J
2074923872 Merge branch 'develop' into staging 2016-11-16 15:42:11 +01:00