Commit graph

15252 commits

Author SHA1 Message Date
gregoirenovel
f1924d22e4
Merge pull request #2850 from betagouv/fix-2847
Corrige les erreurs lors de la création d'une démarche avec un logo
2018-10-17 10:01:31 +02:00
gregoirenovel
f8b1bc96bb Hide other delete links when the demarche has not been persisted 2018-10-17 09:32:27 +02:00
gregoirenovel
2c44754981 [Fix #2847] Hide the delete logo link if demarche is not persisted 2018-10-17 09:32:27 +02:00
LeSim
bc0756ca64
Merge pull request #2853 from betagouv/dev
2018-10-16-07
2018-10-16 22:42:54 +02:00
LeSim
4680f90a40
Merge pull request #2849 from betagouv/fix_stats_again
StatsController: avoid division by nil
2018-10-16 22:38:49 +02:00
simon lehericey
aff085bb6b StatsController: avoid division by nil 2018-10-16 18:02:00 +02:00
Pierre de La Morinerie
bd2df609c7
Merge pull request #2845 from betagouv/bump-gems
Bump gems
2018-10-16 16:39:10 +02:00
gregoirenovel
5ad6787b82 Bump development gems
- rubocop (0.59.0 → 0.59.2)
- scss_lint (0.57.0 → 0.57.1)
2018-10-16 15:33:23 +02:00
gregoirenovel
2ab38955b7 Bump default gems
- administrate (0.10.0 → 0.11.0)
- groupdate (4.0.1 → 4.0.2)
- spreadsheet_architect (3.1.0 → 3.2.0)
- webpacker (4.0.0.pre.pre.2 → 4.0.0.pre.3)
2018-10-16 15:33:23 +02:00
gregoirenovel
ccb6fd63af Merge branch 'dev' 2018-10-16 13:29:00 +02:00
gregoirenovel
3786a718ff
Merge pull request #2842 from tchak/carto-champ-models
Add carte champ model
2018-10-16 13:05:51 +02:00
Paul Chavard
93ba94a9e6 Add carte champ and geo area models 2018-10-16 14:01:12 +03:00
Paul Chavard
202e055b7b Add geo areas schema 2018-10-16 14:00:52 +03:00
gregoirenovel
56509e6ab9 Merge commit '8f3c427' 2018-10-16 12:45:13 +02:00
gregoirenovel
f5fc83b4cd Merge commit 'b4911b8' 2018-10-16 11:56:41 +02:00
gregoirenovel
9c6dffedd4 Merge commit 'aabfe28' 2018-10-16 11:37:44 +02:00
gregoirenovel
b2c1a5b1c7
Merge pull request #2841 from betagouv/fix-2833
[Fix #2833] Move /fixtures files to /support
2018-10-16 11:03:44 +02:00
gregoirenovel
d3a58f2fce Merge commit '366928e' 2018-10-16 10:57:08 +02:00
gregoirenovel
baf69acbcb [Fix #2833] Move /support files to /fixtures 2018-10-16 10:47:41 +02:00
Frederic Merizen
758c47343f
Merge pull request #2802 from betagouv/frederic/fix_2772-migrate_dossiers
Restore deleted dossiers
2018-10-16 10:47:19 +02:00
Frederic Merizen
bbdb446dfd [#2772] For unmigrated dossiers, make read-only access possible
and notify usager
2018-10-16 10:40:04 +02:00
Frederic Merizen
1e4ccda14c [#2772] Notify users that their dossier was restored 2018-10-16 10:40:04 +02:00
Frederic Merizen
3283cb1ae7 [#2772] Allow per-migrated-dossier callback 2018-10-16 10:40:04 +02:00
Frederic Merizen
bc22c97501 [#2772] Restore deleted dossiers for neph procedure 2018-10-16 10:40:04 +02:00
Frederic Merizen
f236e31c29 [#2772] Restore deleted dossiers for candidats libres procedure 2018-10-16 10:40:04 +02:00
Frederic Merizen
ecfacf8417 [#2772] Avoid touching champ update date 2018-10-16 10:40:04 +02:00
Frederic Merizen
1d0ce21555 [#2772] Migrate pieces justificatives 2018-10-16 10:40:04 +02:00
Frederic Merizen
840b049cdb [#2772] Allow untranslatable dossiers to be skipped 2018-10-16 10:40:04 +02:00
Frederic Merizen
dfe7f2cc45 [#2772] Also migrate private champs 2018-10-16 10:40:04 +02:00
Frederic Merizen
f7fcf46f0d [#2772] Avoid overriding initialize in subclasses 2018-10-16 10:40:04 +02:00
Frederic Merizen
6a3f7438d5 [#2772] Let migrator instantiate mapping from provided class 2018-10-16 10:40:04 +02:00
Frederic Merizen
968ccce7f0 [#2772] Move method to champ class 2018-10-16 10:40:04 +02:00
Frederic Merizen
11bd342897 [#2772] Helper methods can now be private 2018-10-16 10:40:04 +02:00
Frederic Merizen
55dfba68a3 [#2772] Extract method 2018-10-16 10:40:04 +02:00
gregoirenovel
8f3c427c70
Merge pull request #2839 from betagouv/ssl-typhoeus
Remove ssl_verifypeer option in ApiEntreprise::API.call
2018-10-16 10:31:07 +02:00
gregoirenovel
a8af27105d Remove ssl_verifypeer option in ApiEntreprise::API.call
SSL seems OK for https://entreprise.api.gouv.fr/
2018-10-16 10:23:30 +02:00
gregoirenovel
00dd1ed806
Merge pull request #2838 from betagouv/rest-client
Simplify ApiCarto::API.call
2018-10-16 10:23:11 +02:00
gregoirenovel
98a3bc32e5 Merge commit '48de67b6c9c0faa337994f86ed81f6bbf73cdd04' 2018-10-16 10:17:53 +02:00
gregoirenovel
5a326db650 Simplify ApiCarto::API.call
SSL seems OK for https://apicarto.sgmap.fr
2018-10-16 10:16:44 +02:00
gregoirenovel
60a383e174
Merge pull request #2837 from betagouv/refactor-ban
Refactor ban
2018-10-16 09:44:21 +02:00
gregoirenovel
99894961a5 AddressController#get → #suggestions 2018-10-16 09:38:53 +02:00
gregoirenovel
6658b466cb address/get → address/suggestions 2018-10-16 09:38:53 +02:00
gregoirenovel
43f9fc93de AddressController#get_address_point → #geocode 2018-10-16 09:38:53 +02:00
gregoirenovel
f01057267b address/address_point → address/geocode 2018-10-16 09:38:53 +02:00
gregoirenovel
e667cad617 ban → address 2018-10-16 09:38:53 +02:00
gregoirenovel
79ebdc3443 Ban::SearchController → AddressController 2018-10-16 09:38:53 +02:00
gregoirenovel
b4911b8a70
Merge pull request #2836 from betagouv/carto-lib-3
Carto lib 3
2018-10-16 09:38:16 +02:00
gregoirenovel
0018326451 Add some spacing to specs 2018-10-16 09:33:16 +02:00
gregoirenovel
f66f0f9668 Remove two useless initialize methods 2018-10-16 09:33:16 +02:00
gregoirenovel
22088b167d Remove ApiAdresse::Geocodeur 2018-10-16 09:33:16 +02:00