DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
21025 commits 4 branches 1166 tags 84 MiB
Commit graph

800 commits

Author SHA1 Message Date
Mathieu Magnin
2355cdeeae Demarches Actives -> Publiées 2019-01-17 14:04:58 +01:00
Paul Chavard
41c9b21509 Use new editor 2019-01-17 11:20:31 +01:00
Pierre de La Morinerie
62ee710382 sign_in: remove hack for displaying the procedure context 
Before there was no way to display the informations about a procedure
without having a dossier. Thus an empty dossier was created.

Now we can display the informations of a procedure using a @procedure
instance variable, so we can move this hack away.
 2019-01-16 14:25:12 +01:00
Pierre de La Morinerie
5d6005dbe9 views: make dossier optional on procedure_footer 
This allow displaying the procedure footer even when
there is no dossier yet
 2019-01-16 14:25:12 +01:00
Pierre de La Morinerie
d36696442b layouts: migrate sign_in to the shared layout 2019-01-16 14:25:12 +01:00
Pierre de La Morinerie
13f1d4c7d9 views: rename dossier_footer to procedure_footer 2019-01-16 14:25:12 +01:00
simon lehericey
a197285742 [fix #2612] Admin: add missing steps to admin UI 2019-01-09 16:25:00 +01:00
Pierre de La Morinerie
0a7b061e70 layouts: move the procedure_context CSS to its own stylesheet 2019-01-07 15:40:19 +01:00
Pierre de La Morinerie
e25bd7139f layouts: use a common procedure_context layout for the demarche overview 2019-01-07 15:39:58 +01:00
Pierre de La Morinerie
5a36546485 layouts: rename "application" to "application_old" 2019-01-07 12:17:05 +01:00
Chaïb Martinez
144bc86cd0 Add sendinblue tracking in admin backoffice pages 2019-01-07 10:27:50 +01:00
Chaïb Martinez
0452a3046c Add sendinblue tracking in admin backoffice pages 2019-01-07 10:27:50 +01:00
Chaïb Martinez
b04de622c6 Add sendinblue js 2019-01-07 10:27:50 +01:00
gregoirenovel
c66342aa2f Add a CTA in the header on the registration page 2019-01-07 08:52:51 +01:00
gregoirenovel
65798feba3 Unify code 2019-01-07 08:12:52 +01:00
gregoirenovel
382a50abcf Reorder the admin sidebar links 2019-01-07 08:12:52 +01:00
gregoirenovel
9c130c41da Remove ProcedureDecorator 2019-01-03 12:08:25 +01:00
Chaïb Martinez
1a7d0f2e12 Remove mailto contact DS into admin header 2018-12-26 14:43:34 +01:00
maatinito
a1a11adb83 [#325] Make the notification layout inherit from the general layout 2018-12-20 16:21:27 +01:00
maatinito
d80bf601e1 [#325] Add support for a footer in layout.html.erb 2018-12-20 16:21:27 +01:00
maatinito
f51cdd0e48 Add a partial for the emails' signature 2018-12-20 11:20:10 +01:00
Chaïb Martinez
408ee31595 Add Sendinbue subscribe form 
Remove Mailjet newsletter subscribe popin
 2018-12-19 12:35:22 +01:00
Chaïb Martinez
80133601c7 Add Matomo tracking code for logged usagers 2018-12-06 19:44:50 +01:00
Pierre de La Morinerie
ea8bc0c961 mailers: improve notification layout 2018-11-27 15:51:26 +01:00
gregoirenovel
e8c24c27e5 [Fix #110] Remove any reference left to facades 2018-11-22 11:25:55 +01:00
Chaïb Martinez
3187b5b05a Add Matomo tracking code 2018-11-07 17:34:10 +01:00
Paul Chavard
a7de2e68ed Refactor types_de_champ views to use service instead of facade 2018-11-07 11:36:10 +01:00
Paul Chavard
6e4d111e09 Refactor and fix procedure update error handling 2018-10-30 15:59:37 +01:00
simon lehericey
2238e5bd9f Time.now => Time.zone.now 2018-10-26 10:10:20 +00:00
Chaïb Martinez
f47aab8ce6 Improve the help CTA message for instructeurs 2018-10-18 18:38:04 +02:00
gregoirenovel
0ae8c1d719 [Fix #2880] Do not show our phone number to instructeurs 2018-10-18 18:38:04 +02:00
Chaïb Martinez
e0ea605460 [Fix #2877] Modification du titre contact dans le menu instructeur 2018-10-18 18:27:36 +02:00
Chaïb Martinez
a8b40c4a18 Modification du texte dans le header admin. Ajout du tel et de l'email de de support 2018-10-18 15:31:59 +02:00
Chaïb Martinez
baca93dc38 Rename the Informations tab to Publication 2018-10-03 16:03:43 +02:00
Pierre de La Morinerie
36c1aa118d dossier: remove RecapitulatifController 
And add a redirection to the new URLs.
 2018-10-02 15:42:29 +02:00
Pierre de La Morinerie
d476953108 dossier: remove Invites view 2018-10-02 14:40:47 +02:00
Pierre de La Morinerie
cd938b4c36 dropdown: refactor to make the button an actual button 2018-09-27 17:43:08 +02:00
Pierre de La Morinerie
c79c1a2636 carto: update link to dossier 2018-09-27 17:22:59 +02:00
Pierre de La Morinerie
40cf7ebdcb mailers: update links to messagerie 2018-09-27 17:22:59 +02:00
simon lehericey
bd04972f65 Profile: move to new design 2018-09-27 10:14:32 +02:00
simon lehericey
f115658d55 OH ! 2018-09-27 10:14:32 +02:00
gregoirenovel
89deb93e1d Remove marianne_small.png 2018-09-24 12:16:58 +02:00
Paul Chavard
539f15af92 Fix new lines in confirm dialogs 2018-09-19 14:45:10 +02:00
Paul Chavard
bfe7240235 Fix event bubbling on Mobile Safari 2018-09-13 09:19:09 +02:00
gregoirenovel
00ecae5f93 Procédure → Démarche 2018-09-05 15:46:24 +02:00
lucien mollard
b2f2e75f43 mailer: add layout for notifications emails 2018-09-05 15:31:08 +02:00
gregoirenovel
e927f56e0d Use a proper HAML comment 2018-09-03 11:41:25 +02:00
gregoirenovel
bdb961f280 Rename support-navigator-banner to outdated-browser-banner 2018-09-03 11:41:03 +02:00
gregoirenovel
1b545123fa Improve the outdated browser support banner style 
- In the new design, it is now at the top of the
  page
- In the new design, it no longer covers up the UI
- In the new design, the text is now left-aligned
  which makes it easier to read
- In the new design, its height has been reduced
  which makes it less annoying
 2018-09-03 11:35:08 +02:00
Paul Chavard
7ac4dc355f Add default dossier_id to contact form on dossier pages 2018-08-30 15:12:50 +01:00
gregoirenovel
c015365057 Fix case typos 2018-08-30 14:23:45 +02:00
gregoirenovel
3662b82039 accompagnateur → instructeur 2018-08-29 23:09:08 +02:00
Paul Chavard
509613afe6 Use contact_link helper instead of mailto 2018-08-29 16:08:01 +01:00
gregoirenovel
a86e3a3156 Don’t change a button’s text when disabled after click 2018-08-23 10:59:11 +02:00
gregoirenovel
e6442436ba Remove a space before a final period 2018-08-22 11:23:06 +02:00
gregoirenovel
af56e73572 Open the browser-update.org link in a new tab 2018-08-22 11:21:00 +02:00
gregoirenovel
0b7060d48b Improve the outdated browser message 2018-08-22 11:21:00 +02:00
gregoirenovel
e0bb0ac7b6 Use the proper product name 2018-08-21 18:05:09 +02:00
Paul Chavard
f4f3a302b9 Do not rely on rails env to detect staging 2018-08-21 15:43:06 +02:00
Paul Chavard
541df2d961 Add support for in browser sentry 2018-08-13 11:44:32 +02:00
Paul Chavard
8bf5dedd80 Ruby helpers for js.erb responses 2018-08-13 08:34:10 +02:00
Pierre de La Morinerie
b4f8c69d89 browsers: add comment to minimum browsers version rules 2018-08-06 15:13:06 +02:00
Pierre de La Morinerie
a9ddadfdd2 browsers: remove IE-specific browser detection 
- It doesn't work in IE >=10 (as support for conditionnal comments was
  removed)
- It is redundant with our all-browsers detection anyway
 2018-08-06 15:13:06 +02:00
Pierre de La Morinerie
c73da9d299 browsers: make outdated browser message more actionnable 2018-08-06 15:00:12 +02:00
Pierre de La Morinerie
1ca2ca9121 invite: support remote forms 
This allows to keep the draft content when inviting a new user.
 2018-08-01 17:41:12 +02:00
Pierre de La Morinerie
9541e781bb invite: rename 'email' to 'invite_email' 2018-08-01 17:41:12 +02:00
Paul Chavard
78a9365fe1 Package mailjet widget with webpack 2018-08-01 16:54:39 +02:00
Pierre de La Morinerie
01cdd910df invite: don't display email of following accompagnateurs 
We don't want the individual contact of Accompagnateurs to be displayed, for privacy reasons.
 2018-08-01 13:48:58 +02:00
Pierre de La Morinerie
b7382375e2 specs: fix disabling jQuery animations during tests 2018-08-01 11:46:04 +02:00
Paul Chavard
bf7c023380 Add webpacker and use it for new_design 2018-07-25 15:14:06 +02:00
gregoirenovel
ed436bfe77 [Fix #2260] Add a search field in the usager UI 2018-07-17 17:26:42 +02:00
Pierre de La Morinerie
d2eb597380 admin: fix Procédures pluralization and accent 2018-07-09 11:40:13 +02:00
Pierre de La Morinerie
b4b533f0c5 dossiers: change all links to use the new user dossiers list 2018-07-02 13:58:58 +02:00
Mathieu Magnin
fee961ea1e In dev env, load xray 2018-06-27 14:20:15 +02:00
Pierre de La Morinerie
d77530b6a6 dossiers: move link back to the old ui 2018-06-27 11:37:06 +02:00
Pierre de La Morinerie
f242c73974 dossiers: make link in the header point to the new UI 2018-06-26 18:04:04 +02:00
Pierre de La Morinerie
a569a566fc header: use active_link_to for setting the active class on links 2018-06-26 18:04:04 +02:00
Pierre de La Morinerie
956c3fe36c Replace hardcoded phone numbers by a CONTACT_PHONE constant 2018-06-25 11:51:15 +02:00
Pierre de La Morinerie
51e256e122 header: fix link to the contact email 2018-06-25 11:26:45 +02:00
Pierre de La Morinerie
755600acf4 layout: move the landing footer to its own file 2018-06-19 16:23:43 +02:00
Frederic Merizen
fd10310cbf [Fix #1568] Use new procedure preview 2018-06-19 12:42:46 +02:00
Mathieu Magnin
e05fb2d0ae Allow dossier deletion if instruction has not started 2018-06-19 10:05:00 +02:00
gregoirenovel
6be05e8fc5 Add a local variable to the bizdev_signature partial 2018-06-01 20:48:50 +02:00
gregoirenovel
b82ed65568 [Fix #885] Convert .text.erb to .html.haml 2018-06-01 17:14:48 +02:00
gregoirenovel
23931a7591 Remove the contact_email locale 2018-06-01 00:00:11 +02:00
gregoirenovel
185f08f63e Add constants for email addresses 2018-06-01 00:00:11 +02:00
gregoirenovel
4e9565a5df Adds User#owns? 2018-05-31 14:39:43 +02:00
gregoirenovel
661010100d [Fix #1536] Remove stringupcasepatch 2018-05-31 11:49:25 +02:00
gregoirenovel
dc045bdefb [Fix #1808] Use &. where possible 2018-05-31 11:49:25 +02:00
Mathieu Magnin
b68563f45f Only dossier owner can see delete button 2018-05-30 18:01:36 +02:00
Mathieu Magnin
28fc32db6d Change delete button wording 2018-05-30 18:01:36 +02:00
Mathieu Magnin
aaf1bc0b99 [Fix #1931] User can ask support to delete dossier 2018-05-24 16:42:16 +02:00
gregoirenovel
de201fca04 Add FAQ_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
5126503cfc Add MENTIONS_LEGALES_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
5e2219416e Add the DOC_URL constant 2018-05-22 17:23:56 +02:00
simon lehericey
304c04275c Admin Nav Bar: link to new service if no service available 2018-05-18 16:21:26 +02:00
Frederic Merizen
a8f2528dcd Add services to procedure admin menu 2018-05-18 16:21:26 +02:00
Frederic Merizen
ec21f78274 Cosmetic refactor left procedure admin panel 2018-05-18 16:21:26 +02:00
Paul Chavard
da8ad1f3e2 Remove external scripts from mailjet widget 2018-05-17 13:27:27 +02:00
simon lehericey
95db5e5767 [fix #1560] update logo in mail 2018-05-15 12:27:28 +02:00
Mathieu Magnin
3e50903b66 [Fix #1873] Add pre maintenance warning 2018-05-02 16:52:38 +02:00
Mathieu Magnin
7cf21d5171 User header should not display the 'go to user interface' button 2018-04-10 18:08:28 +02:00
Mathieu Magnin
2f8206edd5 [Fix #1799] Extract bizdev signature to prepare reuse 2018-04-09 11:08:13 +02:00
gregoirenovel
29f35f29a9 [Fix #1628] Change phone number 2018-03-15 15:05:52 +01:00
gregoirenovel
031b9c0bab Update documentation links to GitBook v2 2018-03-15 09:37:24 +01:00
gregoirenovel
53ad9d3611 [Fix #1591] Add rel attribute to target blank links 2018-03-13 11:24:12 +01:00
gregoirenovel
657b9d2e93 Change link to doc 2018-03-12 17:51:39 +01:00
Mathieu Magnin
5b07f59ffb fix data tag without a value attribute 2018-03-08 23:18:49 +01:00
gregoirenovel
eb977ab798 [Fix #1565] Improve accessibility of the landing page 
- Improve the alt text for the header logo
- Empty alt text for decorative images
- Improve the alt text for the logos of our users
- Improve the alt text for footer logos
 2018-03-08 15:25:37 +01:00
Mathieu Magnin
9f6d6e61fb [Fix #1577] logo link in navbar on gestionnaire UI should not link to admin UI 2018-03-08 14:10:26 +01:00
gregoirenovel
ca061dc12f Add alt descriptions for images 2018-03-06 17:37:37 +01:00
gregoirenovel
55608414ad Improve the title format 2018-03-06 17:37:09 +01:00
Guillaume RISCHARD
0544ac3ffe Modifications d'accessibilité au template de base 2018-03-06 16:19:08 +01:00
gregoirenovel
4d8315b997 Change the FAQ URL 2018-03-02 10:30:47 +01:00
gregoirenovel
67da280fa0 Change logos that included “tps” 2018-03-01 10:33:53 +01:00
gregoirenovel
0af270faa0 tps.apientreprise.fr -> demarches-simplifiees.fr 2018-03-01 10:33:53 +01:00
gregoirenovel
17421e54cc In JS, TPS -> DS 2018-03-01 10:33:53 +01:00
gregoirenovel
1b8b6a3274 TPS -> demarches-simplifiees.fr 2018-02-28 18:14:06 +01:00
gregoirenovel
e2366ce658 Improve the footer 2018-02-28 18:09:20 +01:00
gregoirenovel
7e2e249ade Introduce the footer logos 2018-02-27 16:36:16 +01:00
gregoirenovel
03559eec0b Remove some footer voodoo to simplify things 2018-02-27 16:36:16 +01:00
simon lehericey
6ff1d6cb18 [fix #1411] user: add a link to users dossiers 2018-02-27 15:24:51 +01:00
gregoirenovel
3e02c62f45 Add the DINSIC logo to the footer 2018-02-26 17:45:17 +01:00
gregoirenovel
917c6b8a32 Fix accessibilite link 2018-02-26 17:08:23 +01:00
gregoirenovel
9c93000e69 [Fix #1468] Add Accessibilité page 2018-02-26 15:48:10 +01:00
gregoirenovel
f928b6cdeb [Fix #1476] Add Mentions légales link 2018-02-26 15:48:10 +01:00
simon lehericey
b30d0c2785 GoogleAnalytics: remove 2018-02-26 13:46:18 +01:00
gregoirenovel
ac6ba40598 Unscope the procedures on Gestionnaire and add #visible_procedures 2018-02-23 17:12:58 +01:00
simon lehericey
864b98c6dc Gestionnaire: various missing avis urls 2018-02-22 17:02:20 +01:00
simon lehericey
0308345008 Gestionnaire: move procedures_path to gestionnaire_procedures_path 2018-02-22 17:02:20 +01:00
simon lehericey
a752627d00 Gestionnaire: move recherche_path to gestionnaire_recherche_path 2018-02-22 17:02:20 +01:00
Mathieu Magnin
3efcadd855 [Fix #1164] Do not show profile switcher for current profile 2018-02-21 15:16:30 +01:00
Mathieu Magnin
6ed1d7f833 [Fix 1413] User header should not contain accompagnateurs links 2018-02-21 14:22:59 +01:00
simon lehericey
9297cbc642 Manager: regenerate views template to match the new version 2018-02-07 15:43:16 +01:00
Paul Chavard
8a55ac79f1 Remove global BROWSER and use browser helper 2018-02-05 10:35:51 +01:00
Mathieu Magnin
11dbc595c7 Store in constant CGU url 2018-01-29 11:08:19 +01:00
gregoirenovel
5723c4c894 Remove any reference to the SGMAP 2018-01-18 17:39:56 +01:00
Mathieu Magnin
d5c036362b Remove old controller and templates 2018-01-17 18:04:23 +01:00
gregoirenovel
1368cd4b03 [Fix #1120] Delete the old accompagnateur UI 2018-01-15 10:02:10 +01:00
gregoirenovel
7c34807f46 Don’t use unless 2018-01-12 11:32:43 +01:00
Mathieu Magnin
e3ec8643db In manager display libelles with line breaks 2018-01-11 11:03:34 +01:00
gregoirenovel
289461d708 Handle the GitHub org rename: sgmap -> betagouv 2018-01-10 17:26:25 +01:00
Mathieu Magnin
440c2b5dd1 [Fix #1098] add administrate custom layout to add logout link 2018-01-10 13:44:02 +01:00
gregoirenovel
301eb411cd Remove two opensimplif-related files 
They seem unused
 2018-01-08 17:03:41 +01:00
Mathieu Magnin
642dc4ba21 [Fix #1118] New ui is the default ui for gestionnaire 2017-12-21 23:20:59 +01:00
gregoirenovel
2b294e2a95 [Fix #1123] Remove the beta banner in production 2017-12-19 11:48:21 +01:00
Simon Lehericey
40b9a77395 Dossier: replace nouveau scope by en_construction 2017-12-15 17:37:30 +01:00
LeSim
3dda27b281 [fix #504] Dossier: received -> en_instruction 2017-12-15 12:10:54 +01:00
LeSim
56545933a9 [fix #504] Dossier: initiated -> en_construction 
The change must not impact the api
 2017-12-15 11:52:09 +01:00
gregoirenovel
060c607772 Add link to the FAQ website in the footer 2017-12-12 10:11:13 +01:00
Simon Lehericey
4014912ea4 [fix #1042] keep footer only for the landing 2017-12-07 16:32:22 +01:00
gregoirenovel
3cbead5b48 Add link to the documentation in the footer 2017-12-07 16:15:44 +01:00
gregoirenovel
0d22ecfe5a Delete the CGU-related files and mentions 2017-12-07 16:15:44 +01:00
gregoirenovel
1c413eeec4 [Fix #1036] Change the links to the CGU: use the GitBook version 2017-12-07 16:15:37 +01:00
gregoirenovel
9a51940024 [Fix #393] In the footer, mentions légales link -> API doc link 2017-12-07 16:15:37 +01:00
Simon Lehericey
e709b773b1 Logo: add a11y 2017-12-05 11:33:44 +01:00
Simon Lehericey
6c73766e0d [fix #1013] fix logo on ie11 2017-12-05 11:17:34 +01:00
gregoirenovel
407c578f68 Delete the SGMAP link from the footer 2017-12-04 16:47:05 +01:00
gregoirenovel
3c5361a96f Correctly handle the print stylesheet 2017-11-28 15:22:50 +01:00
gregoirenovel
2415d628d1 [Fix #160] Delete the remaining link to our staging environment 2017-11-24 17:08:56 +01:00
Simon Lehericey
a71574b8dd [fix #445]: add title to pages 2017-11-21 17:47:27 +01:00
gregoirenovel
481c38dee2 [Fix #896] Add a visible contact dialog for gestionnaires 2017-11-21 16:49:25 +01:00
gregoirenovel
a46aa83f00 Use a class instead of a tag as a tab link selector 2017-11-21 16:49:25 +01:00
Simon Lehericey
9750af24d4 typo 2017-11-07 14:49:58 +01:00
Mathieu Magnin
793a2aa4c4 Remove crisp because Benjamin left 2017-10-17 11:52:09 +02:00
gregoirenovel
316d8e09b5 Allow accompagnateurs to print a Dossier 2017-10-16 09:33:58 +02:00
gregoirenovel
b2f63f7f38 Delete redis and actioncable 2017-10-12 07:21:02 +02:00
Mathieu Magnin
356c16b1bc Hide crisp default button, to avoid usagers to spam us 2017-09-22 10:29:49 +02:00
Mathieu Magnin
a927affae6 Display avis counter on header 2017-09-21 10:41:53 +02:00
Simon Lehericey
d1540c4a68 Avis: add avis link in header 2017-09-20 15:42:26 +02:00
Mathieu Magnin
ca82fba170 [Fix #738] TPS link on header should navigate on same UI 2017-09-19 17:53:38 +02:00
Simon Lehericey
0b832a873c Search: replace placeholder to 'Rechercher un dossier' 2017-09-07 16:50:02 +02:00
Mathieu Magnin
c713518ac1 [Fix #494] If super-admin is connected, add an link in the header menu 2017-09-06 11:13:58 +02:00
Simon Lehericey
1a1bc461f7 ProfileSwitch: change link to stay in the old design part 2017-09-06 11:11:44 +02:00
Simon Lehericey
b8a75621e3 New_design: add design switch button 2017-09-06 11:11:43 +02:00
Mathieu Magnin
bf97a111f9 Old recherche with new design 2017-09-06 11:11:43 +02:00
gregoirenovel
7af3f90197 Rename header-left-menu to header-tabs 2017-09-06 11:11:38 +02:00
Simon Lehericey
a7f270bac4 Follow: user new dossier follow controller instead of backoffice 2017-09-06 11:11:22 +02:00
Simon Lehericey
033f08524f Gestionnaire: refactor follow? 2017-09-06 11:11:21 +02:00
Mathieu Magnin
f0777e166f Add sticky footer 2017-09-06 11:11:19 +02:00
Mathieu Magnin
7a0d6108e1 .footer -> %footer 2017-09-06 11:11:18 +02:00
Mathieu Magnin
d0fa94fef0 Remove %page-width-container from footer 2017-09-06 11:11:10 +02:00
Mathieu Magnin
22bb4b7c92 Change link in switch profile menu to match new route 2017-09-06 11:11:09 +02:00
Mathieu Magnin
29b201ad00 Add left menu in navbar 2017-09-06 11:11:08 +02:00
gregoirenovel
75aebe4f07 Add the archivees scope on Procedure 2017-07-13 14:46:09 +02:00
gregoirenovel
89feb6cdf7 Add the brouillons scope on Procedure 2017-07-13 14:46:08 +02:00
gregoirenovel
fc2540649f Add the publiees scope on Procedure 2017-07-13 14:46:07 +02:00
Simon Lehericey
693c2a43ac [Fix #592] mutualize sanitize and clean flash messages 2017-07-13 10:14:16 +02:00
Simon Lehericey
da7af28f9f [Fix #592] Remove useless html_safe 2017-07-13 10:14:16 +02:00
Simon Lehericey
831ccac685 Turbolinks: do not reload mailjet js on every page 2017-07-11 10:00:29 +02:00
Simon Lehericey
b2e99dd755 Turbolinks: do not reload application js on every page 2017-07-11 10:00:29 +02:00
gregoirenovel
6a381caaee Add the archived scope to Procedure 2017-07-10 17:24:53 +02:00
gregoirenovel
411c5791c8 Use the not_archived Procedure scope 2017-07-10 17:24:43 +02:00
gregoirenovel
31b23ac74e Add the not_published Procedure scope 2017-07-10 17:24:39 +02:00
gregoirenovel
5f50f76341 Add the published scope en Procedure 2017-07-10 16:54:01 +02:00
Simon Lehericey
48e881f9ec [FIX #491] Attestation: allow administrateur to change attestation template on a published procedure 2017-07-04 13:59:54 +02:00
Simon Lehericey
1d4a0dce56 Header: fix alignement in ff 2017-07-04 13:48:56 +02:00
Mathieu Magnin
dc4decc827 Add profile switcher in header 2017-07-03 14:34:31 +02:00
Mathieu Magnin
5d8c798369 Connexion button is a secondary button 2017-07-03 14:34:31 +02:00
Mathieu Magnin
33af09cae5 Account menu on header 2017-07-03 14:34:31 +02:00
Mathieu Magnin
b7dc511a7d Create a clean application.js file for new design 2017-07-03 14:34:31 +02:00
Mathieu Magnin
649af19443 Add search field in navbar 2017-07-03 14:34:30 +02:00
Simon Lehericey
689d0c2dd7 ProcedureOverview: add layout 2017-06-29 16:07:46 +02:00
Simon Lehericey
26afa24e49 [Fix #512] Crisp: add crisp to homepage 2017-06-29 14:35:24 +02:00
Mathieu Magnin
8d008a51d0 [fix #474] display devise errors with flashes 2017-06-21 18:07:58 +02:00
Mathieu Magnin
f1ab350897 fix turbolinks bug when switching between layouts 2017-06-20 17:34:48 +02:00
Mathieu Magnin
250b858128 json style for hashes 2017-06-20 17:31:58 +02:00
Mathieu Magnin
8b9eda0f43 No login link on header on login page 2017-06-19 18:21:15 +02:00
Simon Lehericey
523df76ecb Attestation: fix attestation_template_admin_link 2017-06-16 15:44:40 +02:00
Simon Lehericey
b664709c3d [Fix #196] Attestation: allow vizualisation after the procedure is published 2017-06-16 12:11:10 +02:00
Simon Lehericey
fdb4d15bcf [Fix #196] AttestationTemplate: add edition 2017-06-16 12:11:09 +02:00
gregoirenovel
b64c6d8817 Add a separator before the “Reouvrir” button 2017-06-13 15:14:51 +02:00
gregoirenovel
b58c02180c [Fix #197] Allow a gestionnaire to add a motivation 2017-06-13 15:14:50 +02:00
gregoirenovel
33944e343a Add Backoffice::DossiersController#process_dossier and use it 2017-06-13 15:05:09 +02:00
Mathieu Magnin
8b92b44ab0 Track ask demo click on home page 2017-06-02 10:05:00 +02:00
gregoirenovel
ab1c19c09b Rename some Dossier scopes 2017-06-01 10:58:08 +02:00
gregoirenovel
627ce150a7 Capture the Chartkick JS and yield it in the layout 
So that we can include all the JS at the bottom of
the page without error
 2017-05-29 15:46:54 +02:00
Simon Lehericey
23e57f5cc4 Navbar: add deprecation warning for invitations 2017-05-29 11:44:28 +02:00
Mathieu Magnin
7c662aa7b2 Gestionnaire invited on dossier for avis, cannot see private form / change dossier state / follow dossier / see invited people / see others avis 2017-05-29 11:44:28 +02:00
Mathieu Magnin
43f481b7ff Gestionnaire can list dossiers where he is invited for avis 2017-05-29 11:44:28 +02:00
Simon Lehericey
5cc4862983 [Fix #349] NewHeader: the logo is a link to root_path 2017-05-29 11:35:29 +02:00
Simon Lehericey
b30cb34fa2 LeftPanelBackofficeDossier: fix a typo 2017-05-22 17:58:12 +02:00
Mathieu Magnin
8af72f7b9a Isolate new design stylesheets 2017-05-17 18:06:53 +02:00
Mathieu Magnin
14bfda2e26 [Fix #251] Fix landing page design on mobile (and add responsive) 2017-05-17 18:06:46 +02:00
Simon Lehericey
8d6838e8ed Mailjet: fix https errors 2017-05-16 13:44:07 +02:00
Simon Lehericey
f2d9953e59 Fix #295: mailjet script should be in https 2017-05-16 10:27:10 +02:00
Mathieu Magnin
9bec2e9536 Fix #281 Remove unreadable tooltip on procedure libelle 2017-05-15 16:55:24 +02:00
gregoirenovel
a58a8684d9 [Fix #285] Gestionnaire.dossiers_follow -> followed_dossiers 2017-05-15 15:51:51 +02:00
Mathieu Magnin
8f5fdfa81f Rename dossier_with_notification_for 2017-05-12 15:42:33 +02:00
Mathieu Magnin
e5ac555a41 fix #245 it should only count dossiers with notifications on followed dossiers 2017-05-12 10:13:51 +02:00
Simon Lehericey
cebb197994 Fix #171 : add localtime to a bunch of date 2017-05-11 15:10:49 +02:00
Simon Lehericey
a312628383 Newsletter: add mailjet widget 2017-05-11 10:11:40 +02:00
Simon Lehericey
c6fd3045e4 Fix #261 : add link to return to dossier list. 2017-05-10 16:24:21 +02:00
Simon Lehericey
5d915ada88 Css: add border on header and footer 
Remove headers border on homepage
 2017-05-09 12:38:57 +02:00
Simon Lehericey
9f1217c843 FlashMessage: center flash message 
otherwise the #flash_message.center is useless
 2017-05-09 12:28:27 +02:00
Simon Lehericey
9d16c0365a Notification: remove useless notification system 2017-05-05 14:08:36 +02:00
Simon Lehericey
dc371b83b8 CSS: add new application layout + CSS 
Without bootstrap!
 2017-05-04 18:24:57 +02:00
gregoirenovel
402f44c5fd Champs privés -> Annotations privées 2017-05-04 11:35:23 +02:00
gregoirenovel
77dae0462b Utilisateur -> Usager 2017-05-04 11:35:23 +02:00
gregoirenovel
f310f672b6 Extract class attributes from HAML tag attributes 2017-04-26 17:22:31 +02:00
gregoirenovel
7ddcb9aedc Extract id attributes from HAML tag attributes 2017-04-26 17:22:30 +02:00
gregoirenovel
51daa2f498 Use implicit div tags instead of explicit 2017-04-26 17:01:45 +02:00
Mathieu Magnin
6ef6a66c3f Remove @facade_data_view from left_panel view 2017-04-26 16:55:22 +02:00
Mathieu Magnin
7a9fd77af0 Remove archived=false filter from en_construction scope (Fix : archived dossier is not shown to user) 2017-04-21 14:36:50 +02:00
Mathieu Magnin
1a628dc42c Remove DossierListFacade dependency 2017-04-21 14:36:50 +02:00
gregoirenovel
e504531ca0 Use the new_application layout for the landing page 2017-04-20 12:18:16 +02:00
gregoirenovel
f9b4469660 Add the new footer 2017-04-20 12:18:16 +02:00
gregoirenovel
336e6120a6 Add the new header 2017-04-20 12:18:16 +02:00
gregoirenovel
e605be9246 Add the new_application layout 2017-04-20 12:18:15 +02:00
gregoirenovel
c10c2fc31b Selectors must be written in lowercase with hyphens 2017-04-20 10:35:53 +02:00
gregoirenovel
ddf02ccd6d Use a non-breaking space after the “numéro” contraction 2017-04-19 11:19:53 +02:00
gregoirenovel
ba4ee68019 Use masculine ordinal indicator instead of the degree sign 
It’s the right way to contract “numéro”

We should use the superscript lowercase o but
it’s hard to do in places where only raw text is
available
 2017-04-19 11:19:53 +02:00
Simon Lehericey
4cd21580fb DescriptionController: move html_safe to the view 
html_safe could not work upon redirection as stated here :
https://groups.google.com/forum/#!topic/rubyonrails-core/z52zgDgUmbs
 2017-04-19 10:52:04 +02:00
gregoirenovel
21ff863dab [Fix #112] Add favicons 2017-04-17 19:32:26 +02:00
gregoirenovel
664d821dc0 Add a link to the Stats page in the footer 2017-04-11 15:29:18 +02:00
gregoirenovel
9c04d3ff93 All CSS declarations must end with a semi-colon 2017-04-10 17:55:55 +02:00
gregoirenovel
3797015908 All colons must be followed by a single space 2017-04-10 17:55:55 +02:00
gregoirenovel
97df69bcd8 In HAML files, separate arguments by a comma and a single space 2017-04-10 17:55:55 +02:00
gregoirenovel
6db4a69cb2 Use spaces inside hashes 2017-04-10 17:55:54 +02:00
gregoirenovel
aaaed328fb Remove unnecessary string outputs 2017-04-10 17:55:54 +02:00
gregoirenovel
2d5df47c4e Use implicit div tags in HAML files 2017-04-10 17:55:53 +02:00
gregoirenovel
e7e4e41e12 Haml Ruby evaluation tags must be followed by a space 2017-04-10 17:55:53 +02:00
gregoirenovel
d1e463b7ab Files should end with a single new line 2017-04-04 16:59:39 +02:00
gregoirenovel
d5e7bbd80d Files should end with a new line 2017-04-04 16:59:38 +02:00
gregoirenovel
15802b18ea Files should not start with a new line 2017-04-04 16:59:38 +02:00
gregoirenovel
87ab2ba9eb Remove trailing spaces 2017-04-04 16:59:37 +02:00
Mathieu Magnin
d5e5a7997a Disable turbolinks cache to avoid weird behavior (ex: page change twice after single click) 2017-04-03 15:43:42 +02:00
Simon Lehericey
a076dc2987 Wording 2017-03-20 12:03:27 +01:00
Mathieu Magnin
ad1250af6f Add confirm popup on important actions 2017-03-09 16:55:47 +01:00
LeSim
9764604430 Merge branch 'develop' into customize_submission_mail 2017-03-07 11:05:04 +01:00
Simon Lehericey
a334888363 Wording 2017-03-06 20:44:25 +01:00
Mathieu Magnin
d03016db9c Merge branch 'develop' into list_dossiers_archived 2017-03-02 16:22:59 +01:00
Simon Lehericey
5cceb9773c Style: simple css for custom emails list 2017-03-02 16:19:05 +01:00
Mathieu Magnin
e9147a8e76 Fix floating login button 2017-03-02 11:20:20 +01:00
Mathieu Magnin
87865fcf1b Merge branch 'develop' into list_dossiers_archived 2017-03-01 10:35:20 +01:00
LeSim
0da239c657 Merge branch 'develop' into simplify_dossier_workflow 2017-02-28 15:23:25 +01:00
Simon Lehericey
870d3719e1 Dossier: add method to allow gestionnaire to reopen dossier 2017-02-28 15:14:27 +01:00
Simon Lehericey
43e6f15c5f Style: fix backoffice navbar 2017-02-28 15:14:01 +01:00
Mathieu Magnin
67daaa033c Merge pull request #28 from sgmap/simplify_dossier_workflow 
Simplify dossier workflow
 2017-02-28 14:56:57 +01:00
Mathieu Magnin
fa884f3ed0 Unarchive button & tests 2017-02-28 14:33:05 +01:00
Simon Lehericey
7b877dc28f Style: fix backoffice dossier width for small screen 2017-02-28 13:54:19 +01:00
Mathieu Magnin
6774dd008f List dossiers archived 2017-02-27 17:44:08 +01:00
Mathieu Magnin
10add61bd1 Clean some tests after removing :validated & :submitted states 2017-02-23 17:54:11 +01:00
Mathieu Magnin
3fcf9bf350 Landing is no longer a symlink on prod/staging env, new call to action on landing is a mailto 2017-02-22 16:07:06 +01:00
Mathieu Magnin
cae5b37e38 First step to remove :validated and :submitted states 2017-02-21 18:05:48 +01:00
Mathieu Magnin
85608f18ab Description page is accessible, some field are disabled if procedure is locked 2017-02-14 18:13:19 +01:00
Simon Lehericey
5359c046e6 Clean grid usage 2017-02-14 17:12:44 +01:00
Xavier J
5d733c11fd Delete references @opensimplif 2017-02-13 15:46:28 +01:00
Xavier Julien
3c6ae2d005 Merge pull request #14 from sgmap/customizable-emails 
Customizable emails
 2017-02-13 15:20:04 +01:00
Mathieu Magnin
5613b896b1 Gestionnaire can archive dossier 2017-02-08 17:35:28 +01:00
Mathieu Magnin
34d05e4d9e Improve the print css for the dossier/show 2017-02-01 14:24:24 +01:00
Mathieu Magnin
2bc5ee88f7 Change controller name according to model name, add simple_form 2017-01-24 15:53:42 +01:00
Mathieu Magnin
7e24adbca0 Add mail preview and small fix 2017-01-23 15:49:19 +01:00
Mathieu Magnin
d5e4f45d7d Add xray-rails in dev mode 2017-01-18 13:59:14 +01:00
Xavier J
f5f5ef1a0d Badge count invites by dossiers 2017-01-12 17:02:30 +01:00
Xavier J
6612e56da2 Mask section left panel is user does not have any dossier 2017-01-11 15:22:24 +01:00
Xavier J
12af46a22a Fix invite dossier validated recapitulative show 2017-01-10 15:04:13 +01:00
Xavier J
23df8a2348 - Ajust TPS for OpenSimplif 
- Create /simplifcations routes for OpenSimplifController
 2017-01-09 17:12:11 +01:00
Xavier J
ab02fe48c3 Force state dossier in files lists on gestionnaire board 2017-01-05 18:01:53 +01:00
Xavier J
99e6749c96 Fix invite to access a files 2017-01-04 18:03:03 +01:00
Xavier J
02d7dfb1dc Add News on footer 2017-01-03 10:47:07 +01:00
Xavier J
fbeb503d9e Reactive Beta Headband 2017-01-03 10:26:47 +01:00
Xavier J
c122a64237 Ajust count notification for procedure left panel in back office gestionnaire 2017-01-02 18:27:01 +01:00
Xavier J
70fcaf281f New landing page 2017-01-02 18:07:04 +01:00
JC
ac85392454 Css for index dossier count, using method in dossier model to get unreaded notification count 2017-01-02 16:45:03 +01:00
JC
620a8559dd Changing css for index dossier counting, wording 2017-01-02 16:07:25 +01:00
JC
442dd5b7b6 Adding facade dossiers_unread_notifications (last) 2017-01-02 15:25:06 +01:00
JC
983cec659b Adding dossiers suivis modifiés to tease informations about new notifications for gestionnaire 2017-01-02 14:39:27 +01:00
JC
dc0d206d88 Changing dossier en cours, for dossiers suivis, in dossier index 2017-01-02 14:17:30 +01:00
JC
b9e2c52c0b Removed left pannel information about notifications in index 2017-01-02 14:16:05 +01:00
JC
c2e8f7ba31 Fix case for submitted dossiers, notification font awsome 2017-01-02 14:06:51 +01:00
JC
3ad0d1e9cd Add css for received dossier, show up to gestionnaire 3 buttons green, orange, red to switch dossier in final states 2017-01-02 11:24:21 +01:00
JC
c4f231d04e Layout for dossier show/index notifications fa (icon) 2017-01-02 10:51:12 +01:00
JC
e131442084 Adding fa to notfications types in dossier show 2017-01-02 10:36:32 +01:00
JC
aa2d2ad924 No notification message, when gestionnaire on index 2016-12-28 12:20:34 +01:00
Xavier J
12edb06a02 Merge branch 'notifications' into develop 2016-12-27 16:03:33 +01:00
JC
fb737df463 Both index and show have notification on there left pannels 2016-12-27 15:26:49 +01:00
Xavier J
c01132c788 Delete old attr in database 2016-12-27 11:57:34 +01:00
JC
cea14845d2 Start backoffice dossier index menu, enable switch between procedures and notifications in left-pannel 2016-12-27 11:15:24 +01:00
Xavier J
e37012dce6 Add badge for new files in procedure list for gestionnaire 2016-12-27 11:06:09 +01:00
Xavier J
ce5bf8d622 Initialize fonction « unread_notifications » in DossierListFacade 2016-12-27 10:47:23 +01:00
JC
9788118229 Adapt listing for notifications, according champ or pieces 2016-12-26 17:59:08 +01:00
JC
f0d0bfc427 Listing updated champs, saving only champs changed 2016-12-26 17:55:31 +01:00
JC
45d5177d52 Prepend notification message for champs and piece_justificative 2016-12-26 17:36:12 +01:00
Xavier J
153c472ef6 Add notifications into procedure list on back office report 2016-12-26 17:25:59 +01:00
JC
02ce392ff3 No notifications result in displayed message 2016-12-26 17:24:40 +01:00
JC
42915979da Notifications are shown in backoffice dossier show, limit 5 2016-12-26 17:18:45 +01:00
JC
a727c5146f Cannot have the right feature test about invites, both side User and Gestionnaire 2016-12-26 14:16:08 +01:00
Xavier J
263d85ccee Merge branch 'develop' into notifications 
# Conflicts:
#	app/views/backoffice/dossiers/_list.html.haml
 2016-12-26 10:53:05 +01:00
Xavier J
31653ff553 Add everywhere col-sm-X and col-xs-X 2016-12-23 16:58:06 +01:00
Xavier J
c533bb0a88 TEST : First implementation of notification with Action Cable : alert message 2016-12-22 22:27:02 +01:00
Xavier J
f98bb90f08 Bootstrap Action Cable and Unicorn 2016-12-22 21:49:31 +01:00
Xavier J
07495ff9ba Ajust UI for notifications 2016-12-22 21:25:55 +01:00
Xavier J
addeaab744 Review UI procedure construction for Administrateur 2016-12-19 19:07:57 +01:00
JC
691f061828 Features tests about user: create and edit dossier 2016-12-19 17:16:07 +01:00
Xavier J
33bfe4a29c Delete un-use code 2016-12-16 14:40:41 +01:00
Xavier J
bc4e3860be Fix all tests 2016-12-14 18:41:33 +01:00
JC
4f7bcba8a3 Adding feature test for procedure_creation 2016-12-14 17:15:10 +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
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
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
JC
004e8de3f9 Ok, big css work now 2016-12-06 16:29:52 +01:00
JC
7058fde758 First step about user registration is safe (CSS) 2016-12-06 13:56:33 +01:00
Xavier J
9f4e4a6b65 New UI for procédure list on admin view 2016-12-05 18:11:18 +01:00
Xavier J
4c2dd0ede1 Fix out of ranch error on search 2016-12-05 16:57:40 +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
JC
c03de66137 Extract dynamics involved constant to fit with utils in fr/en 2016-12-05 15:30:21 +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
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
92e8740ee3 New CGU left panel 2016-12-05 11:45:30 +01:00
JC
27cc62ea1e Working on dossiers#show recapitulatif for users 2016-12-02 16:33:36 +01:00
Xavier J
0c90c2c122 Add unsupport navigator banner 2016-12-02 16:04:23 +01:00
JC
6b1c7b15ee Starting with dossiers#show as User 2016-12-02 12:06:01 +01:00
JC
4717d72dde Using active css class to display which procedure is selected on dossiers#index 2016-12-02 11:25:09 +01:00
Xavier J
418b5faa52 New user tableau de bord UI 2016-12-01 19:43:56 +01:00
Xavier J
ef5a005b35 Add switch button if devise account have user and gestionnaire role. 2016-12-01 18:35:51 +01:00
Xavier J
d2a221ee40 Fix admin log out navbar style 2016-12-01 13:21:56 +01:00
Xavier J
bca0292fc4 Connexion and sign out user navbar style 2016-12-01 13:01:00 +01:00
Xavier J
b779c71cb6 Gestionnaire sign out css 2016-12-01 12:37:56 +01:00
Xavier J
5c61733199 Display left panel only if layout file exist 2016-12-01 12:19:22 +01:00
Xavier J
c682387a39 First change connexion navbar 2016-12-01 10:54:25 +01:00
JC
4048855aa3 expand procedure list to full height 2016-11-30 13:42:19 +01:00
JC
aaf5273b12 Style on procedure elements 2016-11-30 13:36:44 +01:00
JC
06ee5726ed Fixing css on split-hr-left 2016-11-30 11:22:29 +01:00
Xavier J
ea18a6f7dd Ajust global css 2016-11-30 11:04:50 +01:00
JC
409ce10c65 Adding tips to left pannel for dossiers#show 2016-11-29 16:39:06 +01:00
JC
53692be01d Css on left-pannel action for dossiers#show 2016-11-29 16:03:59 +01:00
Xavier J
1a90ed3fa3 Search input only for gestionnaire 2016-11-29 11:49:40 +01:00
Xavier J
2c96f15e93 Display search input on all pages 2016-11-29 11:45:30 +01:00
Xavier J
752ae24c9f New search UX 2016-11-29 09:56:11 +01:00
Xavier J
53b0b9ee63 Fix bug right preference panel 2016-11-28 16:49:50 +01:00
JC
fda8cac51c Finished navbar for dossiers#show, need body: construct dossier 2016-11-28 15:56:38 +01:00
JC
ceff884751 Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2 2016-11-28 15:22:11 +01:00
JC
cb5b6651d5 Working on navbar 2016-11-28 15:22:00 +01:00
Xavier J
178f0f88c1 - Delete page « Tous les dossiers » 
- Fix follow tab
 2016-11-28 14:38:33 +01:00
Xavier J
f4b483976c Add default navbar and left panel 2016-11-28 10:15:11 +01:00
JC
74809b33ce Keep working on dossier Show, need actions to be in navbar, adjust flash messages too, then construct dossier 2016-11-25 16:25:54 +01:00
JC
d974040540 Starting left_pannel and navbar for dossiers show 2016-11-25 12:53:37 +01:00
Xavier J
58df3c3a75 - Continue development Tableau de bord 
- Optimize toggle block
 2016-11-24 19:33:34 +01:00
Xavier J
d09a47ae23 First iteration navbar tableau de bord 2016-11-23 15:21:42 +01:00
JC
c5e0f0a780 Extract css for sign_in sign_out from navbar 2016-11-22 16:32:50 +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
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
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
1fe76b8c3b Add google_analytics partial in layout 2016-11-21 10:53:50 +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