Commit graph

17701 commits

Author SHA1 Message Date
LeSim
5a56fe0182
Merge pull request #1373 from betagouv/fix_pagination
Revert "[#1360] Upgrade SmartListing to fork of 1.2.1"
2018-01-29 17:59:25 +01:00
simon lehericey
691b12688d Revert "[#1360] Upgrade SmartListing to fork of 1.2.1"
This reverts commit 506a505477.
2018-01-29 17:43:30 +01:00
gregoirenovel
d4c06a5b3e Merge branch 'dev' 2018-01-29 11:35:21 +01:00
Mathieu Magnin
31aabcd6b6
Merge pull request #1365 from betagouv/fix-1291
Fix 1291
2018-01-29 11:15:01 +01:00
Mathieu Magnin
ce5ce78eff [Fix #1291] Add CGU link to invite_admin mail template 2018-01-29 11:08:20 +01:00
Mathieu Magnin
839c0e6aa9 Invite admin mail is previewable 2018-01-29 11:08:19 +01:00
Mathieu Magnin
11dbc595c7 Store in constant CGU url 2018-01-29 11:08:19 +01:00
Mathieu Magnin
8ca1c20e84
Merge pull request #1368 from betagouv/increase-password-creation-delay
Increase password creation delay
2018-01-29 11:06:17 +01:00
Mathieu Magnin
8b2fc0f8b4 Increase password creation delay 2018-01-29 10:50:32 +01:00
Frederic Merizen
1c8ae50045
Merge pull request #1366 from betagouv/fix_1360-upgrade_smart_listing
[#1360] Upgrade SmartListing to fork of 1.2.1
2018-01-25 18:08:52 +01:00
Frederic Merizen
506a505477 [#1360] Upgrade SmartListing to fork of 1.2.1 2018-01-25 17:47:10 +01:00
LeSim
af0640d37e
Merge pull request #1361 from betagouv/fix-warnings
Fix warnings
2018-01-23 18:21:10 +01:00
gregoirenovel
a2f4e8b283 factory_girl is now factory_bot 2018-01-23 17:15:42 +01:00
gregoirenovel
5eb4f12b48 Remove a now deprecated Capybara option from tests 2018-01-23 17:14:13 +01:00
LeSim
e3f853307e
Merge pull request #1351 from betagouv/bump-gems
Bump gems
2018-01-23 17:03:19 +01:00
gregoirenovel
f4b0870921 Merge branch 'dev' 2018-01-23 16:40:45 +01:00
gregoirenovel
f5629f8392 Bump capybara 2018-01-23 16:26:57 +01:00
gregoirenovel
9aea126db0 Bump rubocop-rspec-focused 2018-01-23 16:26:56 +01:00
gregoirenovel
2bb6613ca8 Bump rails-controller-testing 2018-01-23 16:26:56 +01:00
gregoirenovel
2761f8ac86 Bump rspec-rails 2018-01-23 16:26:56 +01:00
gregoirenovel
5340b4ed0d Bump turbolinks 2018-01-23 16:26:56 +01:00
gregoirenovel
12b6d30326 Bump sass-rails 2018-01-23 16:26:56 +01:00
gregoirenovel
89a39e2964 Bump rails 2018-01-23 16:26:56 +01:00
gregoirenovel
9cea28aed8 Bump default gems
- active_model_serializers
- rgeo-geojson
2018-01-23 16:26:56 +01:00
gregoirenovel
3f1af527cc Bump prawn_rails 2018-01-23 16:26:56 +01:00
gregoirenovel
3d20b24baf Bump prawn 2018-01-23 16:26:56 +01:00
gregoirenovel
571612f922 Bump draper 2018-01-23 16:26:56 +01:00
gregoirenovel
4c87b62565 Bump deep_cloneable 2018-01-23 16:26:56 +01:00
gregoirenovel
1c78d77c30 Bump default gems
- haml-rails
- jquery-rails
- unicorn
- openid_connect
- omniauth-github (dependencies)
- fog
- mailjet
- smart_listing
- spreadsheet_architect
- apipie-rails
- maruku
- openstack
- browser
- skylight
- simple_form
- scenic
- daemons
- sentry-raven
- administrate (dependencies)
- logstasher
- chartkick
- font-awesome-rails
2018-01-23 16:26:56 +01:00
gregoirenovel
d9d88aca89 Bump development/test gems
- byebug
- dotenv-rails
- pry-byebug
- rspec-rails (dependencies)
- spring
2018-01-23 16:26:56 +01:00
gregoirenovel
7873a69d97 Bump test gems
- timecop
- vcr
- webmock
- database_cleaner
- factory_girl
- guard
- shoulda-matchers
2018-01-23 16:26:56 +01:00
gregoirenovel
d2f7c655d7 Bump development gems
- brakeman
- web-console
- xray-rails
- haml-lint
- scss_lint
2018-01-23 16:26:56 +01:00
gregoirenovel
e76226a9cb
Merge pull request #1313 from betagouv/revert-273b3f2f
Revert "Remove `data_provide` and `data_date_format` attributes"
2018-01-23 16:04:28 +01:00
Mathieu Magnin
469aca999b Revert "Remove data_provide and data_date_format attributes"
This reverts commit 273b3f2faf.
2018-01-19 13:20:53 +01:00
gregoirenovel
ccad372036
Merge pull request #1305 from betagouv/fix-1304
[Fix #1304] If procedure has no path do not crash when hiding it
2018-01-18 18:57:46 +01:00
Mathieu Magnin
e9ec9e410f [Fix #1304] If procedure has no path do not crash when hiding it 2018-01-18 18:52:54 +01:00
gregoirenovel
900fdc81ef
Merge pull request #1308 from betagouv/lambda_tags
Use lambda instead of send for etablissement tag
2018-01-18 18:40:29 +01:00
Frederic Merizen
9b4ce1517c Use lambda instead of send for etablissement tag 2018-01-18 18:35:07 +01:00
Frederic Merizen
6a95cc6498
Merge pull request #1245 from betagouv/fix_1203-restrict_field_by_mail_type
Fix 1203 restrict field by mail type
2018-01-18 18:30:55 +01:00
Frederic Merizen
8f41ab89cf [#1203] Do not include champs privés in accusé de réception 2018-01-18 18:26:14 +01:00
Frederic Merizen
a21dee680d [#1203] Define tags in constants rather than methods 2018-01-18 18:26:14 +01:00
Frederic Merizen
db5bf39e32 [#1203] No implicit available_for_states, make it explicit 2018-01-18 18:26:14 +01:00
Frederic Merizen
21ad13cf74 [#1203] Make all tags multi-line 2018-01-18 18:26:14 +01:00
Frederic Merizen
943fef3160 [#1203] Move all tag definitions to mail template concern
Even the one that is mail-specific, because it is too easy to overlook
it when refactoring otherwise
2018-01-18 18:26:14 +01:00
Frederic Merizen
eebab14954 [Fix #1203] No début d’instruction tag in accusé de réception mails
Doesn’t make sense functionnally
2018-01-18 18:26:14 +01:00
Frederic Merizen
9f7ffddb31 [#1203] Allow filtering tags based on an arbitray status 2018-01-18 18:26:14 +01:00
Frederic Merizen
1282fc2113 [#1203] Use factory girl to instanciate model in spec 2018-01-18 18:26:14 +01:00
gregoirenovel
df934e1bba
Merge pull request #1267 from tchak/httpaccess-on-dev
Put tps-dev (staging) environement behind a BasicAuth
2018-01-18 18:21:30 +01:00
Paul Chavard
26b1de5883 [Closes #1170] Put tps-dev (staging) environement behind a BasicAuth 2018-01-18 18:09:46 +01:00
gregoirenovel
2336b0207e
Merge pull request #1299 from betagouv/sgmap-dinsic
Remove any reference to the SGMAP
2018-01-18 17:55:48 +01:00