Commit graph

2478 commits

Author SHA1 Message Date
gregoirenovel
a0e0cf4e40 Merge pull request #482 from sgmap/fix-440
[Fix #440] Show the current month only if logged in as superadmin
2017-06-26 10:51:00 +02:00
gregoirenovel
469f0aed4b [Fix #440] Show the current month only if logged in as superadmin 2017-06-26 10:50:31 +02:00
gregoirenovel
6d8f22409b Merge pull request #477 from sgmap/fix-176
Delete useless new_assignement email
2017-06-26 10:50:06 +02:00
gregoirenovel
ba5d816ce6 [Fix #176] Delete useless new_assignement email 2017-06-26 10:49:42 +02:00
gregoirenovel
a2b17604e5 Merge pull request #476 from sgmap/remove-commented-code
Remove some commented code
2017-06-26 10:49:22 +02:00
gregoirenovel
3d11a35da8 Remove some commented code 2017-06-26 10:49:02 +02:00
Mathieu Magnin
c5300232a5 Merge pull request #475 from sgmap/474_display_devise_errors_with_flashes
474 display devise errors with flashes
2017-06-22 10:30:46 +02:00
Mathieu Magnin
3f90e82d09 [Fix #327] flashes messages can deal with Arrays 2017-06-21 18:08:05 +02:00
Mathieu Magnin
8d008a51d0 [fix #474] display devise errors with flashes 2017-06-21 18:07:58 +02:00
gregoirenovel
2f9f74aa9f Merge pull request #473 from sgmap/452_redesign_sign_up
[fix #452] redesign sign up form
2017-06-21 17:39:45 +02:00
Mathieu Magnin
ac5c00c26f [fix #452] redesign sign up form 2017-06-21 17:38:38 +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
0084d836dd Merge pull request #472 from sgmap/fix_turbolinks_multiple_layout_bug
Fix turbolinks multiple layouts bug
2017-06-21 15:04:53 +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
1fbfe917c4 Merge pull request #469 from sgmap/468_fix_demo_login
468 fix demo login
2017-06-20 17:27:12 +02:00
Mathieu Magnin
e51d8965a2 [Fix #468] fix demo login 2017-06-20 17:05:05 +02:00
Mathieu Magnin
58350f219a Rewrite tests that should fail so that they actually do 2017-06-20 17:04:54 +02:00
Mathieu Magnin
3f1da18cfb Merge pull request #467 from sgmap/standardize_two_columns_layout
Standardize two columns layout
2017-06-20 14:29:09 +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
bbea035021 Merge pull request #465 from sgmap/avis_sign_up_should_use_generic_css
Avis sign up should use generic css
2017-06-20 10:37:21 +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
2e795fb2a5 single quote => double quotes 2017-06-20 09:51:18 +02:00
gregoirenovel
dabd0cc6fa Merge pull request #464 from sgmap/fix-circleci
Add the parallelism key to the CircleCI conf file
2017-06-19 18:37:12 +02:00
gregoirenovel
24aaa53521 Add the parallelism key to the CircleCI conf file
It’s now required
2017-06-19 18:31:35 +02:00
gregoirenovel
5bafc077d2 Merge pull request #434 from sgmap/410-sign-in-new-design
Fix #410: new sign in page design
2017-06-19 18:29:28 +02:00
Mathieu Magnin
c944088076 Add procedure overview on login 2017-06-19 18:21:15 +02:00
Mathieu Magnin
8b9eda0f43 No login link on header on login page 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
Mathieu Magnin
0bed3ae956 Use new layout for login 2017-06-19 18:21:14 +02:00
gregoirenovel
f68cf3f236 Merge pull request #443 from sgmap/decision-stats
Add stats for encart motivation
2017-06-19 18:19:58 +02:00
gregoirenovel
d0b927857a Add stats for encart motivation 2017-06-19 18:01:59 +02:00
gregoirenovel
19696da736 Add StatsController#percentage 2017-06-19 18:01:57 +02:00
gregoirenovel
458d671c14 Merge pull request #451 from sgmap/motivation-extras
Motivation extras
2017-06-19 15:02:49 +02:00
gregoirenovel
14823560a1 Expose the motivation on exported files 2017-06-19 15:01:14 +02:00
gregoirenovel
ce2def9c40 Expose the motivation on the API 2017-06-19 15:01:14 +02:00
LeSim
8222a7dc28 Merge pull request #453 from sgmap/Fix_attestation_attachment_with_remote_storage
Attestation: fix mail attachment when the files are remotely stored
2017-06-19 14:55:24 +02:00
Simon Lehericey
dd441ff0c7 Attestation: fix mail attachment when the files are remotely stored 2017-06-19 13:47:32 +02:00
LeSim
d8b9ba14c8 Merge pull request #449 from sgmap/Fix_attestation_template_admin_link
Attestation: fix attestation_template_admin_link
2017-06-16 15:59:18 +02:00
Simon Lehericey
523df76ecb Attestation: fix attestation_template_admin_link 2017-06-16 15:44:40 +02:00
gregoirenovel
7c0f621611 Merge pull request #450 from sgmap/fix_attachment_missing
Attestation: fix missing_attachment
2017-06-16 15:40:01 +02:00
Simon Lehericey
5c70d38a23 Attestation: fix missing_attachment 2017-06-16 14:47:44 +02:00