Commit graph

6582 commits

Author SHA1 Message Date
gregoirenovel
6029e816c4 Merge branch 'dev' 2018-10-18 14:00:06 +02:00
gregoirenovel
2982cbca47
Merge pull request #2869 from betagouv/hide-mean-time
Hide the mean verification/instruction times for a special demarche
2018-10-18 13:47:08 +02:00
gregoirenovel
7eeaac5d81 Hide the mean verification/instruction times for a special demarche
It is not relevant for this demarche, and we’re
doing them a favor
2018-10-18 13:10:55 +02:00
Frederic Merizen
7421649ea8
Merge pull request #2745 from betagouv/fix-2610
Modification de texte pour le cadre juridique, afin de le rendre plus clair
2018-10-18 12:17:03 +02:00
Chaïb Martinez
0090ed2e1f Modification de texte pour le cadre juridique, afin de le rendre plus clair et simple a remplir. 2018-10-18 12:09:16 +02:00
LeSim
4ddb614149
Merge pull request #2864 from betagouv/faster_stats
StatsController: avoid doing useless query
2018-10-18 11:55:29 +02:00
simon lehericey
fd9bdbf31d StatsController: avoid doing useless queries 2018-10-18 11:50:43 +02:00
Frederic Merizen
e2b6dfac61
Merge pull request #2862 from betagouv/frederic/fix_2861-coquille
[Fix #2861] Coquille
2018-10-17 20:15:19 +02:00
Frederic Merizen
a0ab2bae04 [Fix #2861] Coquille 2018-10-17 19:50:03 +02:00
gregoirenovel
4a34b7866e Merge branch 'dev' 2018-10-17 15:46:47 +02:00
gregoirenovel
a26db84b74
Merge pull request #2855 from betagouv/fix-2738
[Ref #2738] Cache les exercices à l'usager
2018-10-17 15:43:07 +02:00
gregoirenovel
3a973999a3 [Ref #2738] Hide exercices if not gestionnaire 2018-10-17 15:07:29 +02:00
gregoirenovel
da4037b2fd Add a blank line 2018-10-17 12:24:00 +02:00
gregoirenovel
f9d38762ea [Ref #2738] Remove exercices from a soon-to-be deleted template 2018-10-17 12:24:00 +02:00
gregoirenovel
506a320f4d
Merge pull request #2856 from betagouv/frederic/fix_2741-filter_by_date_soumission
Fix 2741 filter by date soumission
2018-10-17 12:23:12 +02:00
Frederic Merizen
0dea9f9ece [#2741] Additional test to filtered_ids to be sure 2018-10-17 12:16:51 +02:00
Frederic Merizen
c652cf3ae5 [#2741] Expand unit tests for sorted_ids just to be sure 2018-10-17 12:16:51 +02:00
Frederic Merizen
37fb358bd5 [#2741] Expand unit tests for #get_value just to be sure 2018-10-17 12:16:51 +02:00
Frederic Merizen
a2bd0582b9 [Fix #2741] Filter / sort by en_construction_at 2018-10-17 12:16:51 +02:00
gregoirenovel
c741d276c3 Merge branch 'dev' 2018-10-17 11:19:45 +02:00
gregoirenovel
dcb9a75fae
Merge pull request #2760 from betagouv/migrate-siret
Migre la page SIRET vers le nouveau design
2018-10-17 10:42:35 +02:00
Pierre de La Morinerie
c178e9226b spec: add integration tests for the new SIRET flow 2018-10-17 10:37:06 +02:00
Pierre de La Morinerie
015b74ae56 spec: refactor dossier creation spec 2018-10-17 10:37:06 +02:00
Pierre de La Morinerie
879dfa0fcc spec: move dossier_creation_spec to from user to new_user 2018-10-17 10:37:06 +02:00
Pierre de La Morinerie
93f1a53dfc dossier: add page for etablissement 2018-10-17 10:37:06 +02:00
Pierre de La Morinerie
310f4b92d1 dossier: add action to save SIRET number 2018-10-17 10:37:06 +02:00
Pierre de La Morinerie
54ba0f8e50 dossier: add new page for SIRET identification 2018-10-17 10:37:06 +02:00
Pierre de La Morinerie
1cf7568bb4 dossier: extract demarche overview to a partial 2018-10-17 10:37:06 +02:00
gregoirenovel
e3055ec1de
Merge pull request #2844 from betagouv/fix-after-party
deploy: fix after_party deployment
2018-10-17 10:36:57 +02:00
Pierre de La Morinerie
3d897ad488 deploy: fix after_party deployment
This can be tested locally (without running any SSH commands) using:

```shell
bundle exec mina deploy domain="test.domain" to=production --simulate`
```

This commit turns the after_party command from:

```
cd "/var/www/tps/current" && RAILS_ENV="production" bundle exec rake after_party:run
```

to:

```
RAILS_ENV="production" bundle exec rake after_party:run
```

which is more in line with how other commands are run.
2018-10-17 10:32:05 +02:00
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