Commit graph

4044 commits

Author SHA1 Message Date
gregoirenovel
aadc7c79dd
Merge pull request #1394 from betagouv/revert-forked-devise
Revert "Point to a forked devise to fix build errors"
2018-02-01 17:13:35 +01:00
gregoirenovel
7d6b5f8426 Revert "Point to a forked devise to fix build errors"
This reverts commit 1b58bfad3e.
2018-02-01 17:08:17 +01:00
Frederic Merizen
3d31fcca4b
Merge pull request #1393 from betagouv/fix_1012-envoyer_un_dossier_a_un_autre_accompagnateur
[Fix #1012] Send dossier to other accompagnateur
2018-02-01 17:04:26 +01:00
Frederic Merizen
d919d62cf7 [Fix #1012] Send dossier to other accompagnateur 2018-02-01 16:58:01 +01:00
Paul Chavard
9576a82d2b Revert "Bump default gems"
This reverts commit c67f692ad2.
2018-01-31 16:30:38 +01:00
Paul Chavard
9dae8b0cf2 Revert "Disable assets precompile on CI"
This reverts commit ff87e09342.
2018-01-31 16:23:40 +01:00
Paul Chavard
7ce5b82c09 Revert "Commit compiled assets"
This reverts commit db18d54a32.
2018-01-31 16:23:40 +01:00
Paul Chavard
ff87e09342 Disable assets precompile on CI 2018-01-31 16:11:49 +01:00
Paul Chavard
db18d54a32 Commit compiled assets 2018-01-31 16:11:00 +01:00
gregoirenovel
0299525387
Merge pull request #1384 from betagouv/devise-edge
Point to a forked devise to fix build errors
2018-01-31 12:44:33 +01:00
gregoirenovel
1b58bfad3e Point to a forked devise to fix build errors 2018-01-31 12:18:24 +01:00
gregoirenovel
8a998fea5b
Merge pull request #1382 from betagouv/bump-devise
Bump devise
2018-01-31 12:03:30 +01:00
gregoirenovel
87acf63f91 Bump devise 2018-01-31 11:56:02 +01:00
gregoirenovel
8f74cfd571 Change Circle cache key 2018-01-31 11:26:15 +01:00
gregoirenovel
8a078d8c59
Merge pull request #1380 from betagouv/bump-more-gems
Bump more gems
2018-01-31 10:28:22 +01:00
gregoirenovel
c67f692ad2 Bump default gems
- chunky-png
- administrate
- kaminari
- rails
- uglifier
2018-01-30 16:56:51 +01:00
gregoirenovel
a38d96b2f8 Disable a failing test 2018-01-30 16:56:51 +01:00
gregoirenovel
c2e0959d6c Fix a test 2018-01-30 16:56:49 +01:00
gregoirenovel
f306dd636e Refactor some complex code 2018-01-30 16:56:49 +01:00
gregoirenovel
2da724d681 Remove an unused Gestionnaire method and its tests
The tests would fail with rails 5.1
2018-01-30 16:56:49 +01:00
gregoirenovel
7ccae2c4f1 render nothing: true has been removed from Rails
Use head instead
2018-01-30 16:56:49 +01:00
gregoirenovel
3fa9774123 params is now an object and no longer a hash 2018-01-30 16:56:46 +01:00
gregoirenovel
6afaf42e6a The "through" relation used in a HasManyThrough must be declared first 2018-01-30 16:40:04 +01:00
gregoirenovel
5b706cc7d4 Add missing params wrapping to some tests 2018-01-30 16:40:04 +01:00
gregoirenovel
75c8c7c0b3
Merge pull request #1263 from betagouv/better-methods
Better methods
2018-01-30 15:56:45 +01:00
gregoirenovel
25aef60354 Use string interpolation 2018-01-30 15:50:52 +01:00
gregoirenovel
c9a79b4f08 Use map when possible 2018-01-30 15:50:52 +01:00
gregoirenovel
5b62bc4f12 Use transform_keys when possible 2018-01-30 15:45:32 +01:00
gregoirenovel
db8c3030e3 Use transform_values when possible 2018-01-30 15:45:32 +01:00
gregoirenovel
b2fe1b856c Use #sum instead of #inject when possible 2018-01-30 15:45:32 +01:00
Frederic Merizen
24ddbc73ee
Merge pull request #1378 from betagouv/fix_1374-re_monter_smartlisting
Fix 1374 re monter smartlisting
2018-01-30 15:15:26 +01:00
Frederic Merizen
c15e1a6942 [Fix #1374] Add missing parameter
Dossier pagination was only working for dossiers en construction.
2018-01-30 15:04:21 +01:00
Frederic Merizen
0ce26055d8 [#1374] Revert "Merge pull request #1373 from betagouv/fix_pagination"
This reverts commit 5a56fe0182, reversing
changes made to 31aabcd6b6.
2018-01-30 15:04:21 +01:00
Mathieu Magnin
3cff988bf3
Merge pull request #1338 from betagouv/fix-1309
Fix 1309
2018-01-30 14:47:32 +01:00
Mathieu Magnin
830a9ed887 [Fix #1309] Task to clean datetime champs in db 2018-01-30 13:49:16 +01:00
Mathieu Magnin
50abb36c81 [Fix #1309] Format datetime before save 2018-01-30 13:49:16 +01:00
Mathieu Magnin
dcb38d79a3 [Fix #1309] Datetime value should be print with yyyy-mm-dd format 2018-01-30 13:49:16 +01:00
Paul Chavard
fdd6cedeb8 Remove data_provide and data_date_format attributes 2018-01-30 13:49:16 +01:00
gregoirenovel
3fbee9fd0d
Merge pull request #1371 from betagouv/fix-1370
[Fix #1370] downgrade spreadsheet architecture to support date in ODS
2018-01-29 18:39:38 +01:00
Mathieu Magnin
da784aa8e9 [Fix #1370] downgrade spreadsheet architecture to support date in ODS 2018-01-29 18:14:57 +01:00
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
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