Commit graph

17518 commits

Author SHA1 Message Date
Xavier J
8229694e86 Merge branch 'staging' 2016-11-25 12:21:45 +01:00
Xavier J
eac9f2dadc Merge branch 'develop' into staging 2016-11-25 12:21:00 +01:00
Xavier J
f4078124a4 Change local libellé 2016-11-25 12:20:44 +01:00
JC
87a8b68b36 Finished basic commentaire/messages block for dossiers show 2016-11-25 12:20:08 +01:00
Xavier J
8cc6229606 Change max-size for CERFA and PJ 2016-11-25 12:07:01 +01:00
JC
cab4e257cd Add new-action button to toggle default_block for messages 2016-11-25 11:25:33 +01:00
JC
1172987d8a Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-25 11:09:08 +01:00
JC
e6a01e9212 Got last message showed upon messages, adding condition to toggle out this last message on lick 2016-11-25 11:08:58 +01:00
Xavier J
eb75d9b337 Merge branch 'develop' into develop_v2 2016-11-25 10:49:28 +01:00
Xavier J
7e28bff973 Merge branch 'staging' 2016-11-25 10:46:37 +01:00
Xavier J
f9b9f48c9d Merge branch 'develop' into staging 2016-11-25 10:46:22 +01:00
Xavier J
97c2be07ea Change wording submit and receive action 2016-11-25 10:46:08 +01:00
JC
1c1942063b Counting messages 2016-11-25 10:11:11 +01:00
Xavier J
58df3c3a75 - Continue development Tableau de bord
- Optimize toggle block
2016-11-24 19:33:34 +01:00
JC
09fb3d4634 Pursuie over body animation with carets 2016-11-23 17:30:55 +01:00
JC
0b7020e065 Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-23 16:17:45 +01:00
JC
df794b9c89 Ok accordeon javascript upon header lines 2016-11-23 16:17:29 +01:00
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