Commit graph

4529 commits

Author SHA1 Message Date
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
Mathieu Magnin
94b856971e Merge branch 'develop' into staging 2017-03-22 13:39:03 +01:00
Mathieu Magnin
4543949dc4 Merge pull request #44 from sgmap/gemfile-cleanup
Clean the gemfile
2017-03-22 13:38:22 +01:00
Mathieu Magnin
c2a27c6f6a Merge branch 'develop' into auto_archive_on_date 2017-03-22 11:32:56 +01:00
gregoirenovel
9c91cbe78d Group the scenic gem declaration 2017-03-22 11:07:49 +01:00
gregoirenovel
ed11b66778 Remove brakeman for now 2017-03-22 11:07:48 +01:00
gregoirenovel
f393b96dea Remove rubocop for now 2017-03-22 11:07:48 +01:00
gregoirenovel
d41dabe00a Remove the simplecov gem (unused) 2017-03-22 11:07:47 +01:00
gregoirenovel
6404c7a422 Remove the selenium-webdriver gem (unused) 2017-03-22 11:07:47 +01:00
gregoirenovel
3eef853d59 Use single-quotes everywhere in the Gemfile 2017-03-21 19:07:42 +01:00
gregoirenovel
4dc4f669e8 Improve the Gemfile comments’ formatting 2017-03-21 19:07:41 +01:00
gregoirenovel
4675a84f9e Add spacing in the Gemfile 2017-03-21 19:07:41 +01:00
gregoirenovel
4c3e5a6fad Remove the jbuilder gem (unused) 2017-03-21 19:07:41 +01:00
gregoirenovel
acc5fff05d Remove therubyracer gem (unused) 2017-03-21 19:07:41 +01:00
gregoirenovel
ff1709468a Move dotenv-rails directly into the dev/test Gemfile group 2017-03-21 19:07:40 +01:00
gregoirenovel
abfb6772cf Remove commented instructions in the Gemfile 2017-03-21 19:07:40 +01:00
gregoirenovel
0483fe028f Remove the parallel_test gem 2017-03-21 19:07:40 +01:00
gregoirenovel
f1b1f5102e Remove the railroady gem (unused) 2017-03-21 19:07:40 +01:00
Simon Lehericey
a72a1825ca Config: mina links Sidekiq conf 2017-03-21 17:58:08 +01:00
Mathieu Magnin
05bab5c402 Merge branch 'develop' into staging 2017-03-20 15:56:55 +01:00
Mathieu Magnin
c9d7a6f7f4 Merge pull request #43 from sgmap/select_multiple
Select multiple
2017-03-20 15:56:14 +01:00
Mathieu Magnin
4112af6c93 Fix tests 2017-03-20 13:48:42 +01:00
Mathieu Magnin
c795a7d7e2 Fix tests 2017-03-20 13:38:51 +01:00
Mathieu Magnin
8e91d4ba97 Merge branch 'develop' into select_multiple 2017-03-20 12:30:42 +01:00
Mathieu Magnin
75007825f8 Update champ_decorator.rb 2017-03-20 12:14:16 +01:00
Simon Lehericey
a076dc2987 Wording 2017-03-20 12:03:27 +01:00
Simon Lehericey
ce343aac96 Select Multiple: text in placeholder and add separator 2017-03-20 11:36:06 +01:00
Mathieu Magnin
7f789b1487 Merge pull request #41 from sgmap/field_paragraph
Field explication
2017-03-16 14:41:12 +01:00
Simon Lehericey
ebd2051337 multiple_select: fix decorateur interference 2017-03-16 09:09:15 +01:00
Simon Lehericey
b3624256cd select_multiple: add decoration for view of multiple_select 2017-03-15 17:51:34 +01:00
Simon Lehericey
2f561a9cd0 select_multiple: clean user input 2017-03-15 17:51:34 +01:00
Simon Lehericey
1fa1e9e8e8 select_multiple: add select2 2017-03-15 17:51:34 +01:00
Simon Lehericey
3ed14bf1a4 Cleaning 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