Commit graph

6279 commits

Author SHA1 Message Date
gregoirenovel
2ed4c1da1c Use round brackets 2018-10-15 16:45:30 +02:00
gregoirenovel
0196309822 Remove a useless default in CARTO::SGMAP::API.call 2018-10-15 16:16:16 +02:00
gregoirenovel
1f0af303f3 Remove the unused ModuleApiCarto#classes method 2018-10-15 16:16:16 +02:00
LeSim
8fa9b303ad
Merge pull request #2822 from betagouv/fix_stats
Fix stats
2018-10-15 15:01:57 +02:00
simon lehericey
3d51b7f4a3 so crazy right now 2018-10-15 14:55:07 +02:00
simon lehericey
21e3dc1498 Let the stats be great again 2018-10-15 14:55:07 +02:00
simon lehericey
17b100b4e9 ControllerStat: renaming 2018-10-15 14:55:07 +02:00
gregoirenovel
efc6fd67b0
Merge pull request #2825 from betagouv/cleanup-spec-tasks
spec: move `/spec/lib/rake` to `/spec/lib/tasks`
2018-10-15 14:29:43 +02:00
Pierre de La Morinerie
47af56cf8b spec: move /spec/lib/rake to /spec/lib/tasks
This reflects the structure of the `/lib/tasks` directory.
2018-10-15 11:51:49 +02:00
Paul Chavard
48de67b6c9
Merge pull request #2799 from tchak/refactor-carto
Refactor carto to rely on ujs and some UX fixes
2018-10-14 21:02:26 +02:00
Paul Chavard
9a4975a2dd Remove dead carto code 2018-10-14 12:34:44 +02:00
Paul Chavard
55b955f838 carto: refactor carto editor using new primitives 2018-10-14 12:34:44 +02:00
Paul Chavard
ad2c589e4d carto: extract draw method from old design carto 2018-10-14 12:34:44 +02:00
Paul Chavard
25e71634e7 carto: extract polygonArea helper 2018-10-14 12:34:44 +02:00
Paul Chavard
53c6003d27 carto: use exported polygon styles 2018-10-14 12:34:44 +02:00
Paul Chavard
f321e9df3f carto: use initMap in new design carto 2018-10-14 12:34:44 +02:00
Paul Chavard
485aabf295 carto: export polygon styles 2018-10-14 12:34:44 +02:00
Paul Chavard
e1b068d67c carto: add initMap method 2018-10-14 12:34:44 +02:00
Paul Chavard
561f9a8164 carto: add drawLayer method 2018-10-14 12:34:44 +02:00
Paul Chavard
6673467117 carto: add createLayer and removeLayer methods 2018-10-14 12:34:44 +02:00
Paul Chavard
c6a28d1444 Cleanup carto save 2018-10-14 12:34:44 +02:00
Paul Chavard
38091963c1 Update carto tests 2018-10-14 12:34:44 +02:00
Paul Chavard
2bab056613 Cleanup carto css 2018-10-14 12:34:43 +02:00
Paul Chavard
dff4f2116a Move geographical zones list to a partial 2018-10-14 12:34:43 +02:00
Paul Chavard
c63675461a Add new carto init code 2018-10-14 12:34:43 +02:00
Paul Chavard
5a2a18d8f1 Remove previous carto init code 2018-10-14 12:34:43 +02:00
Paul Chavard
b5a3fc76fb Remove legacy carto routes 2018-10-14 12:34:43 +02:00
Paul Chavard
63a903204f
Merge pull request #2824 from tchak/fix-demarche-modifiee-message
Change demarche modifee message
2018-10-14 12:33:51 +02:00
Paul Chavard
59c1b24f3c Change demarche modifee message
fix #2821
2018-10-13 11:06:31 +02:00
LeSim
af2250c21b
Merge pull request #2819 from betagouv/fix_2818_forbid_empty_mandatory_field
[fix #2818] DossierController: ensure save_draft is authorized
2018-10-12 12:24:28 +02:00
simon lehericey
888bbee097 [fix #2818] DossierController: ensure save_draft is authorized 2018-10-12 12:14:49 +02:00
gregoirenovel
8fd2c95ea2
Merge pull request #2812 from betagouv/fix-manager
Show the service, not the organisation in Procedures list
2018-10-11 14:15:42 +02:00
gregoirenovel
c56ea05f60 Show the service, not the organisation in Procedures list 2018-10-11 14:13:43 +02:00
gregoirenovel
22baf2569f
Merge pull request #2805 from betagouv/fix-2692
Fix #2692
2018-10-11 14:07:39 +02:00
gregoirenovel
56cfcd08d3 [Fix #2692] Move the sign up CTA at the top of the sign in page 2018-10-11 12:22:47 +02:00
gregoirenovel
d78f4a8faf [#2692] Make the sign up button a primary button on the sign in page 2018-10-11 12:22:47 +02:00
gregoirenovel
841e67b19c
Merge pull request #2810 from betagouv/frederic/fix_1961-search_by_individual
Fix #1961 search by individual
2018-10-11 12:22:02 +02:00
Frederic Merizen
3dca3c7dee [Fix #1961] Check that sorted_ids works for individual 2018-10-11 12:13:03 +02:00
Frederic Merizen
abd066c6f4 [#1961] filtered_ids for individual 2018-10-11 12:13:03 +02:00
Frederic Merizen
34da620b0f [#1961] get_value for individual 2018-10-11 12:13:03 +02:00
Frederic Merizen
5d862ae92b [#1961] Add individual fields 2018-10-11 12:13:03 +02:00
Frederic Merizen
58d4ee17d6
Merge pull request #2811 from betagouv/frederic/remove-dead-code
Remove dead code
2018-10-11 12:12:43 +02:00
Frederic Merizen
07b8838561 Remove dead code
Should have been removed as part of #2720 but was accidentally reintroduced
in #2770
2018-10-11 12:00:49 +02:00
gregoirenovel
064b5c1d7b
Merge pull request #2804 from betagouv/frederic/fix_2800-invalid_empty_cell_display
[Fix #2800] Handle empty cells
2018-10-10 20:39:07 +02:00
Frederic Merizen
05c8c3f18b [Fix #2800] Handle empty cells
Evidently link_to handles nil differently when it receives it as a first
argument than when it is returned from a block argument
2018-10-10 20:32:03 +02:00
Frederic Merizen
734352beba
Merge pull request #2803 from betagouv/frederic/fix_2580-allow_instructeur_date_filtering
[Fix #2580] Filter by created_at / updated_at
2018-10-10 19:09:46 +02:00
Frederic Merizen
577475f26e [Fix #2580] Filter by created_at / updated_at 2018-10-10 18:18:28 +02:00
gregoirenovel
165feb20b9
Merge pull request #2726 from tchak/less-jquery
Remove jQuery from new design
2018-10-10 15:20:54 +02:00
Paul Chavard
136031bea4 Remove jQuery import from new design 2018-10-10 15:05:51 +02:00
Paul Chavard
b79e77687e Refactor avis helpers 2018-10-10 15:05:51 +02:00