Commit graph

6436 commits

Author SHA1 Message Date
Paul Chavard
a08f170dbd Assign users and gestionnaires to commentaires
fix #2052
2018-12-05 13:40:57 +01:00
Paul Chavard
b927ab4568 Add user_id and gestionnaire_id to commentaires 2018-12-05 11:25:18 +01:00
gregoirenovel
713557bf23
Merge pull request #3121 from betagouv/sassc-rails
sass-rails → saasc-rails
2018-12-04 17:05:47 +01:00
gregoirenovel
9b380829f8 sass-rails → saasc-rails
saas-rails is deprecated
2018-12-04 15:54:49 +01:00
gregoirenovel
e420a9a7ae
Merge pull request #3114 from betagouv/bump-gems
Bump gems
2018-12-04 15:50:22 +01:00
gregoirenovel
c8958b63fc Bump gem dependencies
- autoprefixer-rails (9.2.0 → 9.4.1)
- bindata (2.4.3 → 2.4.4)
- childprocess (0.8.0 → 0.9.0)
- domain_name (0.5.20170404 → 0.5.20180417)
- haml_lint (0.27.0 → 0.28.0)
- tilt (2.0.8 → 2.0.9)
- mustermann (1.0.2 → 1.0.3)
- rack-oauth2 (1.9.2 → 1.9.3)
- rack-protection (2.0.3 → 2.0.4)
- sass (3.6.0 → 3.7.2)
- selectize-rails (0.12.5 → 0.12.6)
- selenium-webdirver (3.8.0 → 3.141.0)
- sinatra (2.0.3 → 2.0.4)
2018-12-04 15:26:02 +01:00
gregoirenovel
b83ba62587 Bump test gems
- capybara (3.11.0 → 3.12.0)
- rails-controller-testing (1.0.2 → 1.0.3)
2018-12-04 15:26:02 +01:00
gregoirenovel
128da16c43 Bump default gems
- chunky_png (1.3.10 → 1.3.10)
- rgeo-geojson (2.0.0 → 2.1.1)
- simple_form (4.0.1 → 4.1.0)
- skylight (3.1.1 → 3.1.2)
2018-12-04 15:26:02 +01:00
Pierre de La Morinerie
8ae0b32f76
Merge pull request #3120 from betagouv/after_party_task
Add rake task to run after party with mina
2018-12-04 14:46:16 +01:00
Mathieu Magnin
55525af060 Add rake task to run after party with mina 2018-12-04 14:43:55 +01:00
Pierre de La Morinerie
bd519835cd
Merge pull request #3117 from tchak/update-babel
Update webpacker (babel7)
2018-12-04 14:17:41 +01:00
Paul Chavard
2f2aa580f8 Update activestorage.js 2018-12-04 11:37:00 +01:00
Paul Chavard
c492e1cd88 Update webpacker (babel7) 2018-12-04 11:37:00 +01:00
Mathieu Magnin
3cd2f75f71
Merge pull request #3116 from betagouv/bump-rails
Bump rails
2018-12-04 11:27:07 +01:00
gregoirenovel
121086eedd Bump rails 2018-12-04 11:16:42 +01:00
gregoirenovel
f1dcceef33
Merge pull request #3113 from tchak/fix-services-wording
Fix wording on services page
2018-12-04 11:00:28 +01:00
Paul Chavard
f2f8770bb5 Fix wording on services page 2018-12-04 10:55:15 +01:00
Paul Chavard
022f419039
Merge pull request #2609 from betagouv/bump-capybara
Bump capybara (2.18.0 → 3.9.0)
2018-12-04 10:41:33 +01:00
gregoirenovel
fd90774717 Bump capybara-screenshot (1.0.21 → 1.0.22) 2018-12-04 10:35:13 +01:00
gregoirenovel
873bf2fc0f Tell puma to STFU 2018-12-04 10:35:13 +01:00
gregoirenovel
478fb88618 Bump capybara (2.18.0 → 3.11.0) 2018-12-04 10:35:13 +01:00
gregoirenovel
94b6783a65 Slightly change some tests to comply with puma 2018-12-03 16:28:18 +01:00
gregoirenovel
b3d0a113eb Use non-breaking spaces in tests 2018-12-03 16:28:18 +01:00
Mathieu Magnin
9de5587183
Merge pull request #3089 from pengfeidong/fix_3026_champ_date_archivage_auto
[fix #3026] change champ date for archivage auto
2018-12-03 16:09:46 +01:00
pedong
1532d287ae [fix #3026] change champ date for archivage auto 2018-12-03 13:45:40 +01:00
Mathieu Magnin
c195ad2eaa
Merge pull request #3091 from pengfeidong/fix_2969_replace_semicolon_by_comma_in_list_email
[fix #2969] use JS replace semicolon by comma in the list email
2018-12-03 13:11:15 +01:00
pedong
c14f9900d6 [fix #2969] use JS replace semicolon by comma in the list email 2018-12-03 12:59:40 +01:00
Mathieu Magnin
826448d7cc
Merge pull request #3109 from tchak/selection-utilisateur-size
Expose selection utilisateur size on champ carte
2018-12-03 12:55:14 +01:00
Paul Chavard
e873b6a9c4 Expose selection utilisateur size on champ carte 2018-12-03 12:49:03 +01:00
Paul Chavard
6043e59937 Disable after party 2018-12-01 10:30:35 +01:00
Paul Chavard
4293e47545
Merge pull request #3104 from tchak/fix-carte-render
More tests and fixes on carte champ
2018-11-30 15:26:53 +01:00
Paul Chavard
d77a5c9f15 More tests and fixes on carte champ 2018-11-30 13:28:30 +01:00
Paul Chavard
e25f84209a
Merge pull request #3099 from tchak/geo_areas_serialize_as_string
Tester toutes les combinaisons possibles de la sérialisation du champ carte
2018-11-30 12:08:34 +01:00
Paul Chavard
097a15d624 Test and fix all possible cases of champ carte serialization 2018-11-30 12:02:27 +01:00
Mathieu Magnin
c2161fbf85
Merge pull request #3095 from tchak/geojson
Cleanup selection_utilisateur geo_json
2018-11-29 17:50:18 +01:00
Paul Chavard
35d2bc36fc cleanup selection_utilisateur geo_json 2018-11-29 17:10:14 +01:00
Paul Chavard
f51f68ec03
Merge pull request #3090 from tchak/fix-number-champs-validation
Fix number champs validation
2018-11-29 15:21:25 +01:00
Paul Chavard
ca147969ab Fix number champs validation 2018-11-29 15:12:31 +01:00
Paul Chavard
034b3f600b
Merge pull request #3059 from tchak/type_de_champ_key
Type de champ stable API ids
2018-11-29 11:48:54 +01:00
Paul Chavard
c1a2506b01 Add stable ids to all types de champ 2018-11-29 11:41:13 +01:00
Paul Chavard
8d22275742 Make type_de_champ API ids stable 2018-11-29 11:41:13 +01:00
Paul Chavard
1883c57c87 Add stable ids to types_de_champ after every update 2018-11-29 11:41:13 +01:00
Paul Chavard
fb57a07927 Add stable_id to types_de_champ 2018-11-29 11:41:13 +01:00
Frederic Merizen
6c5d3cc2de
Merge pull request #3079 from betagouv/frederic/fix_2180-active_storage_openstack
[#2180] Use different container for activestorage and for carrierwave
2018-11-29 11:40:49 +01:00
Frederic Merizen
dd07a8ca1f [#2180] Use different container for activestorage and for carrierwave 2018-11-29 11:31:58 +01:00
gregoirenovel
608a191ea0
Merge pull request #3086 from tchak/fix-geojson
Fix geojson exposed on legacy carto API
2018-11-29 10:42:05 +01:00
Paul Chavard
c18796d02a Fix geojson exposed on legacy carto API 2018-11-29 08:43:51 +01:00
Paul Chavard
4befb57971
Merge pull request #3084 from tchak/destroy_dossier_operation_logs
Destroy dossier_operation_logs when dossier is destroyed
2018-11-28 17:16:11 +01:00
Paul Chavard
d11cef6b0c Add task to cleanup orphaned dossier_operation_logs 2018-11-28 17:10:29 +01:00
Paul Chavard
9b39934e8b Destroy dossier_operation_logs when dossier is destroyed 2018-11-28 17:06:54 +01:00