Commit graph

6078 commits

Author SHA1 Message Date
Xavier J
dff90d2cf7 Merge branch 'develop' into develop_v2 2016-12-13 14:26:00 +01:00
Xavier J
26ac6d5cc4 Merge branch 'staging' 2016-12-13 14:24:46 +01:00
Xavier J
49c7126f5c Merge branch 'develop' into staging 2016-12-13 14:23:04 +01:00
Xavier J
ec83b397f7 Fix bug invite downcase 2016-12-13 14:22:54 +01:00
Xavier J
84ccfdbfdb Update schema TPS 2016-12-13 14:20:30 +01:00
Xavier J
7bf58388fa Update landing page 2016-12-07 18:08:06 +01:00
Xavier J
414a701b03 Dynamic switch button (User, Gestionnaire, Administrateur) 2016-12-07 18:00:27 +01:00
JC
e228f20684 Adding white back to some views 2016-12-07 17:55:42 +01:00
Xavier J
72ebacf3cc Remove admin connection link on user connection page 2016-12-07 17:38:19 +01:00
Xavier J
1c2b2010d1 Synchronised password when user or gestionnaire change this 2016-12-07 17:35:45 +01:00
Xavier J
7cb2e80a3d Sync credentials between user, gestionnaire and administrateur account 2016-12-07 17:24:01 +01:00
Xavier J
d282d7bbea Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-12-07 17:03:45 +01:00
Xavier J
715f086957 Can connect admin with user session path 2016-12-07 17:03:36 +01:00
JC
e10bd08800 2nd round about css and some adjustements: message/pj empty validation, margins, link_to div inclusion and more 2016-12-07 16:59:35 +01:00
JC
5915a2b7d5 Delete pop menu for sign_out, also count dossiers on user side 2016-12-07 16:27:43 +01:00
Xavier J
3153eeaf01 Fix bug empty 2016-12-07 15:53:26 +01:00
Xavier J
6f731f700f Fix description view for champs and private champs 2016-12-07 15:44:28 +01:00
JC
16bdd1666b Fix display in projet-name 2016-12-07 15:19:49 +01:00
JC
6f019f9a0f Time to launch on staging 2016-12-07 14:44:10 +01:00
Xavier J
dc8e936ee5 Landing page TPS V2 progression 2016-12-07 14:39:06 +01:00
JC
5c93920f74 Mutualize all informations in dossier_show partial, now work on css 2016-12-07 13:58:00 +01:00
Xavier J
746d69796e Remove has-error class on admin views 2016-12-07 11:51:26 +01:00
JC
004e8de3f9 Ok, big css work now 2016-12-06 16:29:52 +01:00
JC
6d8d8470d8 Need to test UI 2016-12-06 15:36:04 +01:00
JC
029fb1faec Continue working on css, display carto (buggy), now adding private fields 2016-12-06 15:22:57 +01:00
JC
f0d5b5dc25 Need to add carto body, and then private field block 2016-12-06 15:17:18 +01:00
JC
e367cba480 Added condition to show renseigner un siret action in dossiers#show 2016-12-06 14:41:50 +01:00
JC
7058fde758 First step about user registration is safe (CSS) 2016-12-06 13:56:33 +01:00
JC
9bf475e1f3 Creating test environnement with new procedure showing each stage, I'll rework each screen till end of new user process 2016-12-06 13:24:39 +01:00
JC
c8f176de74 Using carto block, need to add css classes even if empty + need to refactor some of backoffice/dossiers/show Vs users/recapitulatif/show + then continue on document block and add a siren button on construct dossier 2016-12-06 13:14:06 +01:00
JC
41ebb648ef Having editer action for construct dossier, now need the carto default_block to be shown 2016-12-06 13:06:34 +01:00
JC
02f913afdf Now rework the action interface for dossiers in their show 2016-12-06 12:51:02 +01:00
Xavier J
30d5323d7e New UI for description dossier in user view 2016-12-05 19:30:58 +01:00
Xavier J
9f4e4a6b65 New UI for procédure list on admin view 2016-12-05 18:11:18 +01:00
Xavier J
04e01981e8 Fix authorized routes on show dossier 2016-12-05 17:37:13 +01:00
Xavier J
4c2dd0ede1 Fix out of ranch error on search 2016-12-05 16:57:40 +01:00
JC
461fe22a91 Fixing css on left_pannel for centering infos 2016-12-05 16:37:18 +01:00
JC
0451ae0540 Using css truncation with overflow: hidden; 2016-12-05 16:33:09 +01:00
JC
1449a1dc19 Reworked en-cours css for dossiers#index user side, counting exact 'en cours' dossiers 2016-12-05 16:23:13 +01:00
Xavier J
cc532f74f9 Fix redirection routes for gestionnaires and users with double devise profile 2016-12-05 16:17:24 +01:00
JC
bdd51ce02b Increased font-size for dossier id, user's dossiers#show 2016-12-05 16:11:36 +01:00
JC
94373094fa Adding default welcome message, default opening messages body while no commentaires 2016-12-05 16:01:13 +01:00
JC
c03de66137 Extract dynamics involved constant to fit with utils in fr/en 2016-12-05 15:30:21 +01:00
JC
17e5800487 Add feature flag OpenSimplif for comments per field 2016-12-05 15:24:07 +01:00
JC
5556775ee9 Adding right caret class to navbar options for right pannel modal, also changing callback from hover sign_out, to use mouseover instead 2016-12-05 15:14:39 +01:00
JC
df36b9bd35 Removing 'INDIVIDU' from entreprise default block, from both gestionnaire/user dossiers#show 2016-12-05 15:04:42 +01:00
JC
2e9de46a1c Fix js for sign_out hover displaying credentials, add hidden to tips div into left_pannel dossiers#show 2016-12-05 14:53:22 +01:00
JC
271ce62476 Adding logout information for sign_out hover, changing colors for links 2016-12-05 14:45:00 +01:00
JC
b698046e1e Adding layout for credentials, this dropdown is shown when you pass hover sign_out button. It display email informations about the current gestionnaire/user 2016-12-05 14:06:43 +01:00
Xavier J
09fc59d54b Merge branch 'develop' into develop_v2
# Conflicts:
#	db/schema.rb
2016-12-05 12:11:04 +01:00