Commit graph

15407 commits

Author SHA1 Message Date
gregoirenovel
9ea396cc8b Avoid loading the association for the without_followers scope
As seen in https://stackoverflow.com/questions/5319400/want-to-find-records-with-no-associated-records-in-rails-3
2017-10-17 14:10:34 +02:00
gregoirenovel
0ca4d61803 Merge pull request #797 from sgmap/fix-stats-if-not-super-admin
Fix stats if not super admin
2017-10-17 13:00:53 +02:00
Mathieu Magnin
08f76f336c If not super admin do not display current month in cumul 2017-10-17 12:55:17 +02:00
gregoirenovel
fc490f05e8 Merge pull request #831 from sgmap/import_db_task
Rake task to import yesterday's production backup on dev
2017-10-17 12:52:20 +02:00
Mathieu Magnin
83707be7a8 Rake task to import yesterday production backup on dev 2017-10-17 12:52:06 +02:00
gregoirenovel
bf7d2bdbfd Merge pull request #859 from sgmap/icons-ratio
Icons ratio
2017-10-17 12:48:42 +02:00
gregoirenovel
df4bad9132 Fix the size and viewBox of several SVG icons
- So that they aren’t stretched by the
  background-size attribute
- So that they are properly dimensioned compared
  to other icons
- Note: the attachment icon is slightly different
2017-10-17 12:40:47 +02:00
gregoirenovel
fcbb7f82d6 Merge pull request #837 from sgmap/timeout
Increase the timeout to 60 seconds
2017-10-17 12:39:53 +02:00
gregoirenovel
da1c0480aa Increase the timeout to 60 seconds 2017-10-17 12:31:44 +02:00
gregoirenovel
4dbeee4685 Merge pull request #844 from sgmap/allow_u_tag
Gestionnaire Dossier Show: add u to the allowed tag list
2017-10-17 12:30:44 +02:00
Simon Lehericey
719893c7c2 Gestionnaire Dossier Show: add u to the allowed tag list 2017-10-17 12:29:57 +02:00
LeSim
1577bbb638 Merge pull request #863 from sgmap/fix-header
Fix the border for the selected header item
2017-10-17 12:25:50 +02:00
Simon Lehericey
91afd4fd64 Merge branch 'dev' 2017-10-17 12:07:44 +02:00
gregoirenovel
e555c181e2 Fix the border for the selected header item
It now touches the bottom again
2017-10-17 12:04:26 +02:00
gregoirenovel
65890a7dee Merge pull request #860 from sgmap/remove-crisp
Remove crisp because Benjamin left
2017-10-17 11:57:31 +02:00
Mathieu Magnin
793a2aa4c4 Remove crisp because Benjamin left 2017-10-17 11:52:09 +02:00
gregoirenovel
2c5b9485a3 Merge pull request #862 from sgmap/fix-tests
Fix a test broken by #851
2017-10-17 11:52:01 +02:00
gregoirenovel
eda5dc46b7 Fix a test broken by #851 2017-10-17 11:45:00 +02:00
gregoirenovel
e1e0d021d0 Merge pull request #853 from sgmap/fix-848
[Fix #848] Correctly format the dates in the Identité part
2017-10-17 11:32:39 +02:00
gregoirenovel
29ff27eee9 [Fix #848] Correctly format the dates in the Identité part 2017-10-17 11:32:26 +02:00
gregoirenovel
d895046177 Merge pull request #851 from sgmap/demande-fixes
Demande fixes
2017-10-17 11:32:12 +02:00
gregoirenovel
9e266ca0f4 Remove the .card div from the map partial 2017-10-17 11:31:59 +02:00
gregoirenovel
d42e438546 Extract the pieces jointes part into a partial 2017-10-17 11:31:59 +02:00
gregoirenovel
e053a40902 Don’t use the featured styling on Demande cards 2017-10-17 11:31:59 +02:00
gregoirenovel
2096f83a14 Extract the title from the card when showing the Pièce jointes 2017-10-17 11:31:59 +02:00
gregoirenovel
13ce8c28f0 Extract the title from the card when showing the Carte 2017-10-17 11:31:59 +02:00
gregoirenovel
bbb680e168 Extract the title from the card when showing the Identité 2017-10-17 11:31:59 +02:00
gregoirenovel
239324cdc4 Remove an extra blank line 2017-10-17 11:31:59 +02:00
LeSim
2b88c1bfec Merge pull request #861 from sgmap/fix-tests-that-fail-randomly
Link should exactly match dossier id, not on email like user1234@tps.fr
2017-10-17 11:29:21 +02:00
Mathieu Magnin
e76656955c Link should exactly match dossier id, not on email like user1234@tps.fr 2017-10-17 11:10:03 +02:00
LeSim
16b4395474 Merge pull request #838 from sgmap/better_dossier_champ_display
[Fix #854] Better dossier display
2017-10-17 10:55:20 +02:00
Simon Lehericey
c9d4baa71b Improve the styling of the Demande tab 2017-10-17 10:14:56 +02:00
Simon Lehericey
12223c21f1 [Ref #832] Improve the display of rich text in the Demande tab 2017-10-17 10:14:56 +02:00
Simon Lehericey
267591f27e [Fix #854] Give a length to libellé cells 2017-10-17 10:14:56 +02:00
gregoirenovel
e9733edb1b Merge pull request #858 from sgmap/improve-icons-markup
Improve icons markup
2017-10-17 10:09:46 +02:00
gregoirenovel
fa2ee4797b Don’t use an i tag for icons 2017-10-17 10:02:28 +02:00
gregoirenovel
a89b1cfd35 Merge pull request #857 from sgmap/fix-849
[Fix #849] Improve the display of icons
2017-10-17 10:01:41 +02:00
gregoirenovel
67f2d6599e Add some more forgotten changes in #841 2017-10-17 10:01:26 +02:00
gregoirenovel
e3123ac320 [Fix #849] Fix the display of icons in buttons
Some changes were forgotten in #841
2017-10-17 10:01:26 +02:00
gregoirenovel
2529caa01e Merge pull request #856 from sgmap/unify-filenames
Use underscores instead of dashes in filenames
2017-10-17 10:00:43 +02:00
gregoirenovel
e22014c0d5 Use underscores instead of dashes in filenames 2017-10-17 09:58:40 +02:00
gregoirenovel
fb7ff848af Merge pull request #855 from sgmap/fix_attestation_date
[fix  #845] Attestation: affiche les dates au format français
2017-10-16 23:39:21 +02:00
Simon Lehericey
5257d20ba0 [fix #845] Attestation: affiche les dates au format français 2017-10-16 18:54:19 +02:00
gregoirenovel
45399602c4 Merge pull request #842 from sgmap/typo-fixes
In vertical tables, invert the bold styling
2017-10-16 11:09:53 +02:00
gregoirenovel
8ec4ffde27 In vertical tables, invert the bold styling
the label is now in bold, and the value in a
normal weight:
- it is more usual
- it allows the value to contain bold styling
2017-10-16 10:59:09 +02:00
gregoirenovel
c1cfe594f1 Merge pull request #843 from sgmap/fix_textarea_display
[fix #832] sanitize user input
2017-10-16 10:58:40 +02:00
Simon Lehericey
741167abec [fix #832] sanitize user input 2017-10-16 10:49:54 +02:00
LeSim
9633a194e8 Merge pull request #841 from sgmap/scope_i_style
Style: scope icon style
2017-10-16 10:46:34 +02:00
Simon Lehericey
4fab477b63 Style: scope icon style 2017-10-16 10:29:33 +02:00
gregoirenovel
8e39db409d Merge pull request #798 from sgmap/print
Allow accompagnateurs to print a Dossier
2017-10-16 10:01:47 +02:00