Mathieu Magnin
|
8dace5217a
|
Share badges style in /patron
|
2017-09-21 10:23:22 +02:00 |
|
Simon Lehericey
|
11e8feacce
|
Style: extract class describing empty stuff
|
2017-09-20 17:17:05 +02:00 |
|
Simon Lehericey
|
bacff0a178
|
Avis: wording
|
2017-09-20 15:42:26 +02:00 |
|
Simon Lehericey
|
caaa3169e5
|
Avis instruction: can ask for a confidentiel avis
|
2017-09-20 15:42:26 +02:00 |
|
Simon Lehericey
|
f420cde531
|
Icons: add lock
|
2017-09-20 15:42:26 +02:00 |
|
Simon Lehericey
|
88c27479ee
|
Avis: instruction
|
2017-09-20 15:42:26 +02:00 |
|
Mathieu Magnin
|
e33259a464
|
Add download dossiers button on procedure#show
|
2017-09-19 13:48:10 +02:00 |
|
Mathieu Magnin
|
35d7bac49e
|
Style success flash messages
|
2017-09-15 10:56:14 +02:00 |
|
Mathieu Magnin
|
b477adf586
|
Improve procedure logo on procedure#index
|
2017-09-14 11:41:19 +02:00 |
|
Mathieu Magnin
|
fe7f772f96
|
Improve procedure logo on procedure#show
|
2017-09-14 11:41:19 +02:00 |
|
Mathieu Magnin
|
9c8061d5a4
|
Show pieces justificatives in messagerie
|
2017-09-13 16:27:08 +02:00 |
|
Mathieu Magnin
|
bdf754c0d8
|
Automatically scroll to the last message
|
2017-09-13 16:27:08 +02:00 |
|
Simon Lehericey
|
d9e532684f
|
Login: fix remember me checkbox and forget password link
|
2017-09-08 11:52:30 +02:00 |
|
Simon Lehericey
|
e5150da6c3
|
Breadcrumbs: fix margin bottom
|
2017-09-08 11:29:12 +02:00 |
|
Simon Lehericey
|
c9f69e9693
|
Avis Style: replace bubble image tag by the i tag
|
2017-09-07 10:37:40 +02:00 |
|
Simon Lehericey
|
c93feb27f0
|
Avis style: extract class to avis.scss file for reuse in patron and avis
|
2017-09-07 10:36:25 +02:00 |
|
Simon Lehericey
|
bbb1f77ada
|
Messagerie: extract css for reuse
|
2017-09-07 10:17:24 +02:00 |
|
Simon Lehericey
|
bd9536faac
|
Header: improve padding
|
2017-09-07 10:10:03 +02:00 |
|
Simon Lehericey
|
62c893d704
|
Procedure Index: increase link size to the whole line and apply same style as the dossier index
|
2017-09-06 11:14:00 +02:00 |
|
Mathieu Magnin
|
feda7213f9
|
Action button for instruction state
|
2017-09-06 11:13:59 +02:00 |
|
Mathieu Magnin
|
059a0b961b
|
Action button for construction state
|
2017-09-06 11:13:59 +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 |
|
Mathieu Magnin
|
485a1ceb00
|
[Fix #663] Menu header should be above every element
|
2017-09-06 11:13:57 +02:00 |
|
Simon Lehericey
|
fbd16b8c75
|
Procedure show: add notification icon
|
2017-09-06 11:11:47 +02:00 |
|
Simon Lehericey
|
3e93d21bf5
|
Procedure Index: add notification icon
|
2017-09-06 11:11:47 +02:00 |
|
Mathieu Magnin
|
3e4ba4715d
|
Fix carte bug if user has not draw on map
|
2017-09-06 11:11:46 +02:00 |
|
Mathieu Magnin
|
7441410fff
|
Hide outline on buttons
|
2017-09-06 11:11:45 +02:00 |
|
Mathieu Magnin
|
4a94ce1e16
|
Fix line-height for buttons
|
2017-09-06 11:11:45 +02:00 |
|
Mathieu Magnin
|
4716d40574
|
Resize icon in button does not apply on dropdown
|
2017-09-06 11:11:45 +02:00 |
|
Mathieu Magnin
|
10ce7ad9eb
|
Merge pull request #679 from sgmap/new_icons_for_dossier_action_button
Add new icons for dossier action button
|
2017-09-06 11:11:44 +02:00 |
|
Mathieu Magnin
|
b531f85f97
|
Add new icons for dossier action button
|
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
|
c74bf5dd8f
|
Dossier index use .dossiers-table class
|
2017-09-06 11:11:42 +02:00 |
|
Mathieu Magnin
|
f5ca774e40
|
Add new style .dossiers-table
|
2017-09-06 11:11:42 +02:00 |
|
Mathieu Magnin
|
7e09bd71e4
|
Add hoverable tables
|
2017-09-06 11:11:42 +02:00 |
|
Mathieu Magnin
|
d268151e04
|
Improve default table style
|
2017-09-06 11:11:42 +02:00 |
|
Mathieu Magnin
|
9b95a4732f
|
Add a .vertical class to tables because this is not the default layout
|
2017-09-06 11:11:41 +02:00 |
|
gregoirenovel
|
590c572106
|
Use .tabs instead of .dossier-categories in procedures#show
|
2017-09-06 11:11:39 +02:00 |
|
gregoirenovel
|
93cb2ec118
|
Add badge support to tabs
|
2017-09-06 11:11:39 +02:00 |
|
gregoirenovel
|
cc54fec629
|
Redesign the tabs so that they look more like tabs
|
2017-09-06 11:11:39 +02:00 |
|
gregoirenovel
|
7af3f90197
|
Rename header-left-menu to header-tabs
|
2017-09-06 11:11:38 +02:00 |
|
gregoirenovel
|
08aa2ac524
|
Redesign the tabs so that they look more like tabs
|
2017-09-06 11:11:38 +02:00 |
|
Simon Lehericey
|
b94fc7c132
|
NewDesign: list of avis
|
2017-09-06 11:11:37 +02:00 |
|
Simon Lehericey
|
2923d4448b
|
NewDesign: can ask a new avis
|
2017-09-06 11:11:36 +02:00 |
|
Simon Lehericey
|
f03d8ef909
|
NewDesign: add dossier instruction view
|
2017-09-06 11:11:36 +02:00 |
|
Simon Lehericey
|
9d7066d3c3
|
Form: display mandatory star in red
|
2017-09-06 11:11:35 +02:00 |
|
Simon Lehericey
|
46c144146c
|
Form: add description
|
2017-09-06 11:11:35 +02:00 |
|
Mathieu Magnin
|
c05c1ae72d
|
Fix sticky footer
|
2017-09-06 11:11:34 +02:00 |
|
Mathieu Magnin
|
42a8792071
|
Add icons to patron + new icon folder
|
2017-09-06 11:11:33 +02:00 |
|
Mathieu Magnin
|
32c83dd7a5
|
Add label variations to /patron
|
2017-09-06 11:11:33 +02:00 |
|
Simon Lehericey
|
9f890d1ea7
|
Form: import dossier_link js in new design
|
2017-09-06 11:11:31 +02:00 |
|
Simon Lehericey
|
1b42766836
|
Form: add address auto complete
|
2017-09-06 11:11:31 +02:00 |
|
Simon Lehericey
|
80023e4f7f
|
Form: remove form overflow to improve box shadow on input error
|
2017-09-06 11:11:30 +02:00 |
|
Simon Lehericey
|
2fd486c1a3
|
Form: add pseudo native form validation
|
2017-09-06 11:11:30 +02:00 |
|
Simon Lehericey
|
509b378567
|
Form: add select2 form multiple select
|
2017-09-06 11:11:30 +02:00 |
|
Simon Lehericey
|
e0bd42032a
|
Form: style select
|
2017-09-06 11:11:29 +02:00 |
|
Simon Lehericey
|
9c2e71afa3
|
Form: add various champs html and style
|
2017-09-06 11:11:29 +02:00 |
|
Mathieu Magnin
|
bc07082d17
|
Init js namespace one time
|
2017-09-06 11:11:28 +02:00 |
|
Mathieu Magnin
|
373d9999fc
|
Add map for gestionnaire
|
2017-09-06 11:11:28 +02:00 |
|
Mathieu Magnin
|
bdaa51c5cc
|
Move old js in a directory to avoid conflicts with require_tree
|
2017-09-06 11:11:27 +02:00 |
|
Simon Lehericey
|
3b7244675d
|
Css: add .width-100 utility class
|
2017-09-06 11:11:26 +02:00 |
|
Simon Lehericey
|
877f64599d
|
Form: add send button on the right
|
2017-09-06 11:11:25 +02:00 |
|
Simon Lehericey
|
714b2a5f08
|
NewDesign: gestionnaire can add a new commentaire
|
2017-09-06 11:11:25 +02:00 |
|
Simon Lehericey
|
3ecc4f1327
|
NewDesign: add person icon to message
|
2017-09-06 11:11:24 +02:00 |
|
Simon Lehericey
|
3a8e84b128
|
NewDesign: add guest label to message
|
2017-09-06 11:11:24 +02:00 |
|
Simon Lehericey
|
497f898e1b
|
NewDesign: add dossier messagerie show
|
2017-09-06 11:11:24 +02:00 |
|
Mathieu Magnin
|
8fdc16d89f
|
Remove old font-size
|
2017-09-06 11:11:20 +02:00 |
|
Mathieu Magnin
|
73e6053c19
|
Fix input search margin in header
|
2017-09-06 11:11:20 +02:00 |
|
Mathieu Magnin
|
cbd9df8f0c
|
[Fix #552] Disable default style for buttons on iOS
|
2017-09-06 11:11:20 +02:00 |
|
Mathieu Magnin
|
9731683b43
|
Use default-spacer in forms
|
2017-09-06 11:11:20 +02:00 |
|
Simon Lehericey
|
dfe36ceef7
|
NewDesign Form: unify body and input font
|
2017-09-06 11:11:19 +02:00 |
|
Simon Lehericey
|
2a8b8d4a01
|
NewDesign Form: apply design to textarea
|
2017-09-06 11:11:19 +02:00 |
|
Simon Lehericey
|
9753da8fdd
|
NewDesign Form: move margin from label to input
provide beautiful layouts with or without label between inputs
|
2017-09-06 11:11:19 +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
|
cf63fd6b04
|
Add breadcrumbs
|
2017-09-06 11:11:17 +02:00 |
|
Mathieu Magnin
|
9aac9ba7cd
|
use backoffice-header in views
|
2017-09-06 11:11:17 +02:00 |
|
Mathieu Magnin
|
c0eeec82c4
|
Add backoffice header to patron
|
2017-09-06 11:11:17 +02:00 |
|
Mathieu Magnin
|
2b0c0567b8
|
Add header section in form table
|
2017-09-06 11:11:16 +02:00 |
|
Mathieu Magnin
|
373447a19f
|
Pieces justificatives on dossier page
|
2017-09-06 11:11:16 +02:00 |
|
Mathieu Magnin
|
f9f313e990
|
Add identité demandeur for entreprise on dossier detail page
|
2017-09-06 11:11:15 +02:00 |
|
Mathieu Magnin
|
1c7d9eaa69
|
Add table component to patron
|
2017-09-06 11:11:15 +02:00 |
|
Mathieu Magnin
|
dc00c10366
|
Add card component to patron
|
2017-09-06 11:11:14 +02:00 |
|
Simon Lehericey
|
8cb770dc7a
|
NewDesign: new procedures index respects logo dimension ratio
|
2017-09-06 11:11:13 +02:00 |
|
Simon Lehericey
|
0d3c145ef3
|
NewDesign: procedure show add dossier actions
|
2017-09-06 11:11:12 +02:00 |
|
Simon Lehericey
|
013f2463d1
|
NewDesign: procedure show add dossier status
|
2017-09-06 11:11:12 +02:00 |
|
Simon Lehericey
|
ad1a11ab52
|
NewDesign: procedure show add dossier table
|
2017-09-06 11:11:11 +02:00 |
|
Simon Lehericey
|
b48af51ee9
|
NewDesign: procedure show only header
|
2017-09-06 11:11:11 +02:00 |
|
Mathieu Magnin
|
0528b83fcc
|
Remove %page-width-container from common
|
2017-09-06 11:11:11 +02:00 |
|
Mathieu Magnin
|
e2735b4238
|
Remove %page-width-container from patron
|
2017-09-06 11:11:10 +02:00 |
|
Mathieu Magnin
|
b022649699
|
Remove %page-width-container from header
|
2017-09-06 11:11:10 +02:00 |
|
Mathieu Magnin
|
180044acff
|
Remove %page-width-container from layouts
|
2017-09-06 11:11:10 +02:00 |
|
Mathieu Magnin
|
d0fa94fef0
|
Remove %page-width-container from footer
|
2017-09-06 11:11:10 +02:00 |
|
Mathieu Magnin
|
009a478526
|
Remove %page-width-container from landing
|
2017-09-06 11:11:09 +02:00 |
|
Mathieu Magnin
|
1d53214870
|
Add archived label on procedures list
|
2017-09-06 11:11:08 +02:00 |
|
Mathieu Magnin
|
29b201ad00
|
Add left menu in navbar
|
2017-09-06 11:11:08 +02:00 |
|
Mathieu Magnin
|
bc4e961200
|
Style backoffice title
|
2017-09-06 11:11:08 +02:00 |
|
Mathieu Magnin
|
622a170793
|
Add and design new #index on procedures for gestionnaires
|
2017-09-06 11:11:07 +02:00 |
|
Mathieu Magnin
|
ca94b2bfa4
|
Add generic .container class
|
2017-09-06 11:11:07 +02:00 |
|
Mathieu Magnin
|
810430de0e
|
Add flexbox utility css classes
|
2017-09-06 11:11:07 +02:00 |
|
Mathieu Magnin
|
dcb3a48bd3
|
Tabs component in patron
|
2017-09-06 11:11:06 +02:00 |
|
Simon Lehericey
|
09ed947890
|
Accessibility: reenable :focus pseudo class
usefull when navigating using keyboard to highlight form send button
|
2017-07-26 11:17:40 +02:00 |
|
gregoirenovel
|
4ee17e44dc
|
[Fix #529] Add missing JS file to new_design/application.js
|
2017-07-04 14:11:06 +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
|
6777b51331
|
rename login css to auth, since it will also be used by sign up
|
2017-06-21 17:38:34 +02:00 |
|
Mathieu Magnin
|
482002fe79
|
Avis sign up should use generic layout
|
2017-06-20 13:56:49 +02:00 |
|
Mathieu Magnin
|
3f20d6fb9d
|
login should use generic two columns layout
|
2017-06-20 11:42:54 +02:00 |
|
Mathieu Magnin
|
3388dc0e1f
|
Create generic two-columns layout
|
2017-06-20 11:13:24 +02:00 |
|
Mathieu Magnin
|
a69915d8b5
|
standardize form title
|
2017-06-20 10:24:53 +02:00 |
|
Mathieu Magnin
|
f74462d826
|
Use generic css for avis_sign_up
|
2017-06-20 10:03:49 +02:00 |
|
Mathieu Magnin
|
c944088076
|
Add procedure overview on login
|
2017-06-19 18:21:15 +02:00 |
|
Mathieu Magnin
|
fb5c7e7d23
|
Make login responsive
|
2017-06-19 18:21:15 +02:00 |
|
Mathieu Magnin
|
b68a8b37e8
|
Redesign the login form
|
2017-06-19 18:21:15 +02:00 |
|
Mathieu Magnin
|
a82994f00f
|
Add inputs & labels to patron
|
2017-06-19 18:21:15 +02:00 |
|
Mathieu Magnin
|
765be88d6d
|
Add expand button on patron
|
2017-06-19 18:21:15 +02:00 |
|
Mathieu Magnin
|
90a643d4fb
|
Add /patron page 🎨
|
2017-06-19 18:21:15 +02:00 |
|
Mathieu Magnin
|
624fb13964
|
Buttons style
|
2017-06-19 18:21:15 +02:00 |
|
Simon Lehericey
|
671a0575ce
|
[Fix #196] Recapitulatif: user can download its attestation
|
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
|
b58c02180c
|
[Fix #197] Allow a gestionnaire to add a motivation
|
2017-06-13 15:14:50 +02:00 |
|
gregoirenovel
|
0b6f5a9603
|
Remove bold weight on Avis sign up button
|
2017-06-08 12:24:07 +02:00 |
|
Simon Lehericey
|
b5f1b898c7
|
Add the weekly avis usage to Stats
|
2017-05-31 13:31:19 +02:00 |
|
gregoirenovel
|
f82533be19
|
Use the new_application layout for the Stats page
|
2017-05-29 15:46:54 +02:00 |
|
Simon Lehericey
|
aaf155df72
|
Avis: add sign_up logic for new tps gestionnaire
|
2017-05-29 11:44:28 +02:00 |
|
Simon Lehericey
|
8dabdcc6c4
|
GestionnaireMailer: add a last week report
|
2017-05-23 17:12:18 +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
|
c6fd3045e4
|
Fix #261 : add link to return to dossier list.
|
2017-05-10 16:24:21 +02:00 |
|
Mathieu Magnin
|
054afb40a4
|
[Fix #50, fix #239] Install chartkick the right way
|
2017-05-10 09:28:13 +02:00 |
|
gregoirenovel
|
c6d0ea76bb
|
[Fix #174] Make .default-data-block header titles take the full width
|
2017-05-09 14:36:33 +02:00 |
|
gregoirenovel
|
1a5f9fd067
|
[Fix #105] Show the pieces justificative’ descriptions
|
2017-05-09 12:47: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
|
029186fdf7
|
Css: fix color import
|
2017-05-09 12:18:52 +02:00 |
|
Simon Lehericey
|
bf68814f7a
|
Css: add alert css to new style
|
2017-05-09 11:59:21 +02:00 |
|
Simon Lehericey
|
2668b036b4
|
Css: add center class in new style
|
2017-05-05 14:59:00 +02:00 |
|
Simon Lehericey
|
a26965f41b
|
Cable: remove useless js logic
|
2017-05-05 14:37:59 +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 |
|
Simon Lehericey
|
aee17c5b19
|
CSS: CSS filenames should not contain dashes
|
2017-05-04 18:24:39 +02:00 |
|
Simon Lehericey
|
e7383c7c85
|
CSS: add Meyer's reset.scss
|
2017-05-04 18:24:14 +02:00 |
|
Simon Lehericey
|
38dcf5c74d
|
Application.scss: replace require_tree by explicit import
Change needed for futur new_application.scss and corresponding style
|
2017-05-04 18:23:55 +02:00 |
|
gregoirenovel
|
f58a626648
|
[Fix #99] Improve the info message in _dossier_link.html.haml
|
2017-04-26 16:47:38 +02:00 |
|
gregoirenovel
|
6bb67d639c
|
Use lowercase letters and dashes for CSS classes
As enforced by scss-lint
|
2017-04-25 15:59:03 +02:00 |
|
Mathieu Magnin
|
887512c26c
|
Procedure path can contain dashes and can be longer
|
2017-04-21 16:32:48 +02:00 |
|
gregoirenovel
|
595ea9bb37
|
Add a “Call Us” CTA on the landing page
|
2017-04-21 14:57:54 +02:00 |
|
gregoirenovel
|
0ddd7ae639
|
Add the “CTA” part of the landing page
|
2017-04-20 12:38:00 +02:00 |
|
gregoirenovel
|
663b556766
|
Add the “Users” part of the landing page
|
2017-04-20 12:38:00 +02:00 |
|
gregoirenovel
|
f604ccb7d6
|
Add the “Numbers” part of the landing page
|
2017-04-20 12:37:59 +02:00 |
|
gregoirenovel
|
4b2baa25b7
|
Add the “Testimonials” part of the landing page
|
2017-04-20 12:37:58 +02:00 |
|
gregoirenovel
|
58a7f399c0
|
Add the “Features” part of the landing page
|
2017-04-20 12:18:18 +02:00 |
|
gregoirenovel
|
663cd18364
|
Change the landing page, add the “Hero” part
|
2017-04-20 12:18:17 +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
|
5c1aad2e4f
|
Add the placeholders stylesheet
|
2017-04-20 12:18:15 +02:00 |
|
gregoirenovel
|
8dcf0af56d
|
Add the mixins stylesheet
|
2017-04-20 12:18:14 +02:00 |
|
gregoirenovel
|
3696d3613a
|
Add the typography stylesheet
|
2017-04-20 12:18:14 +02:00 |
|
gregoirenovel
|
40d49aee1f
|
Add the Muli Regular and Bold fonts
|
2017-04-20 12:18:14 +02:00 |
|
gregoirenovel
|
8f2ef4e254
|
Add the colors stylesheet
|
2017-04-20 10:41:03 +02:00 |
|
gregoirenovel
|
01f894316c
|
Rename _variables.scss to _constants.scss
|
2017-04-20 10:41:02 +02:00 |
|
gregoirenovel
|
d8cc41140b
|
Remove an unexpected blank line
|
2017-04-20 10:35:53 +02:00 |
|
gregoirenovel
|
5d4dcf8ec7
|
Don't use line blocks
|
2017-04-20 10:35:53 +02:00 |
|
gregoirenovel
|
c10c2fc31b
|
Selectors must be written in lowercase with hyphens
|
2017-04-20 10:35:53 +02:00 |
|
gregoirenovel
|
73caee0ff3
|
Remove unused declarations
|
2017-04-20 10:05:59 +02:00 |
|
gregoirenovel
|
c32a2432c7
|
Don’t use vendor prefixes
|
2017-04-20 10:05:59 +02:00 |
|
gregoirenovel
|
e2bd606e49
|
Declarations must be terminated by a semicolon
|
2017-04-20 10:05:58 +02:00 |
|
gregoirenovel
|
0316bac137
|
Use double-quoted strings
|
2017-04-20 10:05:58 +02:00 |
|
gregoirenovel
|
11e5943989
|
Only one selector per line
|
2017-04-20 10:05:56 +02:00 |
|
gregoirenovel
|
5e1c99d642
|
Opening curly braces must be preceded by one single space
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
8cad7361cf
|
An operator must be surrounded by single spaces
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
0789cfd311
|
Colons must be followed by a single space
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
8906801d6c
|
Comment literals must be followed by a space
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
4b575bd386
|
Commas are followed by a space
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
4f0de677ab
|
Begin pseudo elements with double colons
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
4b39e76c8a
|
Use extend only with placeholders
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
f3ec7f1d42
|
Indent with two spaces
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
af7b611dd0
|
< 1 numbers must all have a leading zero
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
c9ff601b28
|
Hex colors must be written with uppercase letters
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
f519896e54
|
Hex colors must be 6 characters long
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
2cae8e751e
|
Blocks must be separated by an empty line
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
0d5dd9d492
|
Remove empty rules
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
6a13e481fd
|
Fix the declaration order
|
2017-04-19 17:05:57 +02:00 |
|
gregoirenovel
|
0ed13c9fe7
|
Remove duplicated properties
|
2017-04-19 17:05:56 +02:00 |
|
gregoirenovel
|
c5fc77b606
|
Change the comments style
|
2017-04-19 17:05:56 +02:00 |
|
gregoirenovel
|
bb02339183
|
Use border: none instead of border: 0
|
2017-04-19 17:05:56 +02:00 |
|
gregoirenovel
|
db331447e1
|
Use hex codes for colors
|
2017-04-19 17:05:55 +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
|
e49ea2d0e0
|
PiecesJustificative: add field to set it mandatory
small css to align the fields
|
2017-04-18 17:48:03 +02:00 |
|
gregoirenovel
|
21ff863dab
|
[Fix #112] Add favicons
|
2017-04-17 19:32:26 +02:00 |
|
gregoirenovel
|
11015787bf
|
Add new total numbers to the Stats page
|
2017-04-11 16:51:38 +02:00 |
|
gregoirenovel
|
52ea4a1b8d
|
Add new charts and a segmented control to the Stats page
|
2017-04-11 16:51:38 +02:00 |
|
gregoirenovel
|
9dc4901294
|
Change the template and style of the Stats page
|
2017-04-11 15:29:19 +02:00 |
|
gregoirenovel
|
f84cd7f11b
|
Make Stats a public page
|
2017-04-11 15:29:18 +02:00 |
|
Simon Lehericey
|
3228737a87
|
DossierLink: add edition template
|
2017-04-11 13:54:33 +02:00 |
|
gregoirenovel
|
9c04d3ff93
|
All CSS declarations must end with a semi-colon
|
2017-04-10 17:55:55 +02:00 |
|
gregoirenovel
|
cb677dfb45
|
Indent using 2 spaces
|
2017-04-04 16:59:40 +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 |
|
Mathieu Magnin
|
08442e64a3
|
Update turbolinks
|
2017-04-03 15:43:41 +02:00 |
|
gregoirenovel
|
28747a951f
|
Delete unused assets
|
2017-04-03 13:25:19 +02:00 |
|
Mathieu Magnin
|
096f1e7198
|
Imageoptim on assets saved 400 ko
|
2017-03-30 15:51:39 +02:00 |
|
Simon Lehericey
|
1fa1e9e8e8
|
select_multiple: add select2
|
2017-03-15 17:51:34 +01:00 |
|
Simon Lehericey
|
657ce53a60
|
select_multiple: add multiple_drop_down_list type
|
2017-03-15 17:51:34 +01:00 |
|
Simon Lehericey
|
fb2aef1810
|
Explication: style in edit page
|
2017-03-14 13:58:59 +01:00 |
|
Simon Lehericey
|
d250cafccc
|
Explication: add champ in edit formulaire
|
2017-03-14 13:58:21 +01:00 |
|
Mathieu Magnin
|
5d4e8622f6
|
Merge pull request #38 from sgmap/stats
Stats: add adminitrations stats view
|
2017-03-08 10:59:06 +01:00 |
|
Mathieu Magnin
|
342a6b239e
|
Small css changes
|
2017-03-08 10:55:24 +01:00 |
|
Simon Lehericey
|
6cb88a995f
|
Stats: add adminitrations stats view
|
2017-03-07 18:09:09 +01:00 |
|
LeSim
|
9764604430
|
Merge branch 'develop' into customize_submission_mail
|
2017-03-07 11:05:04 +01:00 |
|
Mathieu Magnin
|
376c50db8f
|
Long procedure title should be cut if too long
|
2017-03-06 16:18:22 +01:00 |
|
Simon Lehericey
|
5cceb9773c
|
Style: simple css for custom emails list
|
2017-03-02 16:19:05 +01:00 |
|
Simon Lehericey
|
db3884cc93
|
Style: fix width in show dossier
|
2017-02-28 16:00:42 +01:00 |
|
LeSim
|
0da239c657
|
Merge branch 'develop' into simplify_dossier_workflow
|
2017-02-28 15:23:25 +01:00 |
|
Simon Lehericey
|
43e6f15c5f
|
Style: fix backoffice navbar
|
2017-02-28 15:14:01 +01:00 |
|
Simon Lehericey
|
7b877dc28f
|
Style: fix backoffice dossier width for small screen
|
2017-02-28 13:54:19 +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
|
ff9c95f18e
|
Merge branch 'develop' into admin_can_modify_procedure_description_after_published
|
2017-02-16 15:59:49 +01:00 |
|
Mathieu Magnin
|
9fcc0920e6
|
Css update
|
2017-02-16 13:59:32 +01:00 |
|
LeSim
|
7bc6e67e15
|
Merge pull request #19 from sgmap/clickable-links-in-champs-description
Add clickable links in champ description and use bootstrap layout for…
|
2017-02-14 17:28:03 +01:00 |
|
Mathieu Magnin
|
11c793a60c
|
Remove custom button code, use bootstrap classes
|
2017-02-14 16:23:48 +01:00 |
|
Mathieu Magnin
|
6c41cbcc5e
|
Clean css
|
2017-02-14 16:20:52 +01:00 |
|
Mathieu Magnin
|
e7b91c3db5
|
Bootstrap default font-size is set to 16px
|
2017-02-14 16:09:52 +01:00 |
|
Mathieu Magnin
|
b08a4c5091
|
Fix style for checkbox and radios
|
2017-02-14 14:34:00 +01:00 |
|
Mathieu Magnin
|
308a037f19
|
Add clickable links in champ description and use bootstrap layout for forms
|
2017-02-14 11:13:48 +01:00 |
|
Mathieu Magnin
|
34d05e4d9e
|
Improve the print css for the dossier/show
|
2017-02-01 14:24:24 +01:00 |
|
Mathieu Magnin
|
9266cf0feb
|
Disable scrollwheel zoom on map
|
2017-02-01 10:31:45 +01:00 |
|
Mathieu Magnin
|
38e8acf285
|
Change some wordings and clean some templates
|
2017-01-31 10:46:20 +01:00 |
|
Xavier J
|
6f31a4d7b7
|
Fix logo TPS with
|
2017-01-03 14:53:56 +01:00 |
|
Xavier J
|
2e04760d10
|
Reactive Github version on home page
|
2017-01-03 10:24:58 +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 |
|
Xavier J
|
c8e4a347ae
|
Change CSS header section construction form
|
2017-01-02 15:20:05 +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
|
b9e2c52c0b
|
Removed left pannel information about notifications in index
|
2017-01-02 14:16:05 +01:00 |
|
JC
|
57d8b4b242
|
Centered buttons for receveid dossiers
|
2017-01-02 14:10:45 +01:00 |
|
JC
|
f407f3a266
|
Need refactoring on dossier_show rendered partials
|
2017-01-02 14:05:31 +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 |
|
Xavier J
|
bfe9211f03
|
Change size wysihtml5 box
|
2017-01-02 10:34:31 +01:00 |
|
Xavier J
|
b929190cf5
|
Disabled Client JS Action Cable
|
2017-01-02 10:25:47 +01:00 |
|
JC
|
aa2d2ad924
|
No notification message, when gestionnaire on index
|
2016-12-28 12:20:34 +01:00 |
|
JC
|
77e30e233c
|
margin action block in left pannel
|
2016-12-28 12:10:27 +01:00 |
|
JC
|
6dd4736f9d
|
Margin credentials and champs in dossier show
|
2016-12-28 11:55:39 +01:00 |
|
JC
|
fb737df463
|
Both index and show have notification on there left pannels
|
2016-12-27 15:26:49 +01:00 |
|
Xavier J
|
7ee555a120
|
Disabled broadcasting
|
2016-12-27 15:05:19 +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 |
|
JC
|
42915979da
|
Notifications are shown in backoffice dossier show, limit 5
|
2016-12-26 17:18:45 +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
|
e25ae6dea0
|
Fix CSS
|
2016-12-22 12:24:59 +01:00 |
|
Xavier J
|
cd7b7e4055
|
- Fix display private form
- Refacto code private form
|
2016-12-22 11:39:44 +01:00 |
|
Xavier J
|
626e42b067
|
Fix search animation
|
2016-12-21 14:36:49 +01:00 |
|
Xavier J
|
e98fc64bcb
|
Fix display bug with scrollbar into UI
|
2016-12-21 14:00:50 +01:00 |
|
Xavier J
|
e258118825
|
Reactive cartographie
|
2016-12-20 14:48:09 +01:00 |
|
Xavier J
|
0563ae1090
|
Fix CSS for default data block Infos
|
2016-12-19 16:31:18 +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
|
6f019f9a0f
|
Time to launch on staging
|
2016-12-07 14:44:10 +01:00 |
|
JC
|
5c93920f74
|
Mutualize all informations in dossier_show partial, now work on css
|
2016-12-07 13:58:00 +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
|
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
|
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 |
|
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 |
|
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
|
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
|
52631a39de
|
Adding fixed-right css class for close btn on right pan (from dossiers#index, the cool one, for field selection)
|
2016-12-05 11:34:56 +01:00 |
|
JC
|
e24008bae4
|
font-size increased for options in download menu (dossiers#index), adding caret to display dropdown
|
2016-12-05 11:27:26 +01:00 |
|
JC
|
bcc4c01b39
|
Expand search bar when clicked
|
2016-12-02 19:05:29 +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 |
|
JC
|
62f64d2bea
|
Working on dossiers#show
|
2016-12-02 10:39:28 +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
|
53f4c52435
|
Have limited display height for messages on dossiers#show
|
2016-11-29 16:26:06 +01:00 |
|
JC
|
53692be01d
|
Css on left-pannel action for dossiers#show
|
2016-11-29 16:03:59 +01:00 |
|
JC
|
67091f995b
|
Changing css index filters dossiers#index
|
2016-11-29 15:47:58 +01:00 |
|
JC
|
f66b593596
|
Continue css upon dossiers#show, doing procedure libelle
|
2016-11-29 14:56:24 +01:00 |
|
JC
|
f823c8b748
|
marge and height upon search global input
|
2016-11-29 14:50:44 +01:00 |
|
JC
|
3772fee85f
|
Dossier content displayed by default on dossiers#show
|
2016-11-29 14:46:09 +01:00 |
|
Xavier J
|
dddb8c193d
|
mini fix css
|
2016-11-29 11:56:00 +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 |
|
JC
|
4a5c053ae5
|
Continue on dossier#show
|
2016-11-28 18:34:31 +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
|
b4fc5a6019
|
Fix filter popup place
|
2016-11-28 15:21:16 +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
|
ecb551e18d
|
Prevent further clicks on submit buttons
|
2016-11-25 15:29:09 +01:00 |
|
JC
|
f978455642
|
Add commentaire joined files (pieces justificatives) direct into messages block
|
2016-11-25 15:01:03 +01:00 |
|
JC
|
d974040540
|
Starting left_pannel and navbar for dossiers show
|
2016-11-25 12:53:37 +01:00 |
|
JC
|
87a8b68b36
|
Finished basic commentaire/messages block for dossiers show
|
2016-11-25 12:20:08 +01:00 |
|
JC
|
cab4e257cd
|
Add new-action button to toggle default_block for messages
|
2016-11-25 11:25:33 +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
|
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 |
|
Xavier J
|
d09a47ae23
|
First iteration navbar tableau de bord
|
2016-11-23 15:21:42 +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
|
55eb8397d2
|
Fixing footer and push left to center on after wrap
|
2016-11-22 11:33:08 +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
|
f5ec476416
|
New application layout struct for pages
|
2016-11-21 14:12:59 +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
|
893bfaef40
|
Fix JS
|
2016-11-17 10:50:28 +01:00 |
|