gregoirenovel
|
a1885c86ce
|
Merge branch 'develop' into staging
|
2017-04-05 14:47:36 +02:00 |
|
Mathieu Magnin
|
31a623ee7a
|
Stop sidekiq service before deploy and start it after
|
2017-04-05 14:47:18 +02:00 |
|
gregoirenovel
|
9915e3d372
|
Merge branch 'develop' into staging
|
2017-04-05 14:43:46 +02:00 |
|
gregoirenovel
|
65ac1da73a
|
Merge pull request #67 from sgmap/move_export_full_generation_to_procedure
Move export_full_generation method from Dossier to Procedure
|
2017-04-05 13:40:23 +02:00 |
|
Mathieu Magnin
|
bf0d466f4b
|
Move export_full_generation method from Dossier to Procedure
|
2017-04-05 12:26:38 +02:00 |
|
gregoirenovel
|
11a471b6a6
|
Merge pull request #56 from sgmap/download_all_dossiers
Download dossiers button exports all dossiers except draft
|
2017-04-05 11:05:52 +02:00 |
|
Mathieu Magnin
|
b18c09e9fd
|
Download dossiers button exports all dossiers except draft
|
2017-04-05 11:04:53 +02:00 |
|
Mathieu Magnin
|
c17ebba916
|
Merge pull request #65 from sgmap/editorconfig
Add a .editorconfig file
|
2017-04-05 10:20:56 +02:00 |
|
gregoirenovel
|
e940c8534e
|
Add a .editorconfig file
|
2017-04-04 17:32:36 +02:00 |
|
Mathieu Magnin
|
e47e6e5c46
|
Merge pull request #66 from sgmap/clean
Clean
|
2017-04-04 17:31:43 +02:00 |
|
gregoirenovel
|
cb677dfb45
|
Indent using 2 spaces
|
2017-04-04 16:59:40 +02:00 |
|
gregoirenovel
|
a1ee82f3dd
|
Indent using spaces, not tabs
|
2017-04-04 16:59:39 +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
|
e0e452b70f
|
Merge pull request #54 from sgmap/wording
Wording
|
2017-04-03 16:07:50 +02:00 |
|
gregoirenovel
|
82c8e14769
|
Wrap a localised string in quotes
Backport from the shared dynamics/fr.yml
|
2017-04-03 16:03:38 +02:00 |
|
gregoirenovel
|
e541fe4ca1
|
Exclude dynamics/fr.yml from shared_paths in mina
So that it is directly read from the Rails app’s
directory
|
2017-04-03 16:03:38 +02:00 |
|
gregoirenovel
|
6cb78acd85
|
Make the birthday field a date field
And remove the date picker (you can now use the
native one)
|
2017-04-03 16:03:38 +02:00 |
|
gregoirenovel
|
8126549a0d
|
Make the datepicker french for the auto archive field
|
2017-04-03 16:03:38 +02:00 |
|
Mathieu Magnin
|
564ff45117
|
Merge pull request #60 from sgmap/update_turbolinks
Update turbolinks
|
2017-04-03 15:55:44 +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 |
|
Mathieu Magnin
|
08442e64a3
|
Update turbolinks
|
2017-04-03 15:43:41 +02:00 |
|
Mathieu Magnin
|
7ede5b1d61
|
Merge branch 'staging'
|
2017-04-03 14:14:04 +02:00 |
|
Mathieu Magnin
|
03aa7358b3
|
Merge pull request #61 from sgmap/assets-cleanup
Delete unused assets
|
2017-04-03 14:04:54 +02:00 |
|
gregoirenovel
|
28747a951f
|
Delete unused assets
|
2017-04-03 13:25:19 +02:00 |
|
Mathieu Magnin
|
b3122a3298
|
Merge branch 'develop' into staging
|
2017-04-03 11:21:01 +02:00 |
|
Mathieu Magnin
|
6deb4169e8
|
Add license
|
2017-04-03 11:05:37 +02:00 |
|
Mathieu Magnin
|
655070c913
|
Merge pull request #57 from sgmap/fix_checkbox_never_checked_when_rendered
Checkbox should be checked when value is 'on'
|
2017-04-03 10:55:51 +02:00 |
|
Mathieu Magnin
|
95b83a57c1
|
Checkbox should be checked when value is 'on'
|
2017-04-03 10:50:15 +02:00 |
|
gregoirenovel
|
066b43fa8a
|
Merge pull request #58 from sgmap/imageoptim
Imageoptim on assets saved 400 ko
|
2017-04-03 10:41:50 +02:00 |
|
Mathieu Magnin
|
096f1e7198
|
Imageoptim on assets saved 400 ko
|
2017-03-30 15:51:39 +02:00 |
|
Mathieu Magnin
|
1c6b95469c
|
Merge branch 'develop' into staging
|
2017-03-29 15:14:52 +02:00 |
|
gregoirenovel
|
868576ecfc
|
Merge pull request #51 from sgmap/fix_departements_drop_down_list
Fix departements / pays / regions drop down list
|
2017-03-29 14:36:30 +02:00 |
|
Mathieu Magnin
|
e4826b468a
|
Fix departements / pays / regions drop down list
|
2017-03-29 14:22:23 +02:00 |
|
Mathieu Magnin
|
d2b293b4b8
|
Merge branch 'develop' into staging
|
2017-03-27 16:27:41 +02:00 |
|
Mathieu Magnin
|
ec2a4dd9a4
|
Merge pull request #47 from sgmap/monsieur
Rename Mr in M.
|
2017-03-27 16:22:00 +02:00 |
|
Mathieu Magnin
|
008602a6ae
|
Merge branch 'develop' into staging
|
2017-03-27 15:47:20 +02:00 |
|
Mathieu Magnin
|
6caa1713b7
|
Fix Gemfile.lock
|
2017-03-27 15:47:05 +02:00 |
|
gregoirenovel
|
c6738bf223
|
Rename Mr in M.
|
2017-03-27 15:45:07 +02:00 |
|
Mathieu Magnin
|
46a87b3283
|
Merge pull request #42 from sgmap/auto_archive_on_date
Auto archive on date
|
2017-03-27 15:44:28 +02:00 |
|
Mathieu Magnin
|
6a8ca67a83
|
Merge branch 'develop' into auto_archive_on_date
|
2017-03-27 15:35:52 +02:00 |
|
Mathieu Magnin
|
2995dfa88e
|
Merge branch 'develop' into staging
|
2017-03-27 14:26:10 +02:00 |
|
Mathieu Magnin
|
720c40e599
|
Merge pull request #46 from sgmap/private-fields-in-api
Update the apipie_examples JSON so that it shows champs_private
|
2017-03-27 12:12:23 +02:00 |
|
gregoirenovel
|
7d9c8db659
|
Update the apipie_examples JSON so that it shows champs_private
|
2017-03-27 11:36:37 +02:00 |
|
Mathieu Magnin
|
d9cb85d8a4
|
Merge pull request #45 from sgmap/fix-demo-sort
Add a sort order to the demo procedures list
|
2017-03-27 10:07:17 +02:00 |
|
Mathieu Magnin
|
f94af0ebd6
|
Merge branch 'develop' into staging
|
2017-03-22 17:59:44 +01:00 |
|
gregoirenovel
|
458f557c93
|
Add a sort order to the demo procedures list
|
2017-03-22 17:52:56 +01:00 |
|
gregoirenovel
|
5910d28a02
|
Revert "Remove therubyracer gem (unused)"
This reverts commit acc5fff05d.
|
2017-03-22 14:37:14 +01:00 |
|