Commit graph

746 commits

Author SHA1 Message Date
Pierre de La Morinerie
01cdd910df invite: don't display email of following accompagnateurs
We don't want the individual contact of Accompagnateurs to be displayed, for privacy reasons.
2018-08-01 13:48:58 +02:00
Paul Chavard
d93ed328b7 Do not share binstubs 2018-07-26 11:12:00 +02:00
Paul Chavard
a482855d5e Run yarn install on deploy 2018-07-26 10:51:37 +02:00
Paul Chavard
19503c8c75 Revert "Run yarn install during deploy"
This reverts commit 264338a495.
2018-07-25 17:57:28 +02:00
Paul Chavard
7579ae9903 Revert "Add yarn install task to mina"
This reverts commit d6000ca56c.
2018-07-25 17:57:18 +02:00
Paul Chavard
d6000ca56c Add yarn install task to mina 2018-07-25 17:17:58 +02:00
Paul Chavard
264338a495 Run yarn install during deploy 2018-07-25 17:06:28 +02:00
Paul Chavard
bf7c023380 Add webpacker and use it for new_design 2018-07-25 15:14:06 +02:00
Pierre de La Morinerie
1348f81f31 manager: fix pluralization of "Dossier" 2018-07-24 11:01:01 +02:00
gregoirenovel
ed436bfe77 [Fix #2260] Add a search field in the usager UI 2018-07-17 17:26:42 +02:00
gregoirenovel
cd22a9742e Move a route inside a collection block 2018-07-17 17:26:42 +02:00
gregoirenovel
4d41381155 Move the attestation route inside the member block 2018-07-17 17:26:42 +02:00
Pierre de La Morinerie
7ca476fc61 manager: add confirmation email actions for the User
- Allow to re-send the confirmation email
- Allow to confirm the email address manually
2018-07-17 12:10:56 +02:00
Pierre de La Morinerie
0aa2c1d9f6 routes: redirect /users/dossiers to /dossiers 2018-07-04 12:23:49 +02:00
simon lehericey
49836564ce Manager: can change dossier state to instruction 2018-07-02 15:57:39 +02:00
Paul Chavard
d0a6957862 Remove old cerfa code 2018-06-28 15:16:20 +02:00
Pierre de La Morinerie
956c3fe36c Replace hardcoded phone numbers by a CONTACT_PHONE constant 2018-06-25 11:51:15 +02:00
Frederic Merizen
226e3ca562 [#1421] Subject linked dropdown field to feature toggle 2018-06-21 16:19:20 +02:00
Frederic Merizen
15e8d8af05 [#1421] Add linked dropown fields 2018-06-21 16:19:20 +02:00
Frederic Merizen
859d8896f8 [#1421] use same order as in TypeDeChamp enum 2018-06-21 16:19:20 +02:00
Pierre de La Morinerie
fa46f7f0d7 config: make assets compilation faster in development 2018-06-19 16:49:14 +02:00
Frederic Merizen
521aec6af9 [#1568] Remove old previsualisation code 2018-06-19 12:42:46 +02:00
Pierre de La Morinerie
2cfa1b441d config: add default config files to the source 2018-06-18 13:13:59 +02:00
Frederic Merizen
78fa6945cb [#2068] Use official French word for mail 2018-06-18 10:42:04 +02:00
Frederic Merizen
354c76e26f [#2068] Remove duplicate devise translations 2018-06-18 10:42:04 +02:00
Frederic Merizen
dd4e6eaa11 [#2068] Add missing devise translations 2018-06-18 10:42:04 +02:00
Pierre de La Morinerie
15511d0863 deploy: don't seed the database
The database should be seeded only when deploying on a fresh new
environment – like a local setup or a review app.

Persistent testing and production environment shouldn't be seeded.
2018-06-15 12:28:18 +02:00
simon lehericey
eee41cbf39 Manager: can reinvite a gestionnaire 2018-06-14 16:41:10 +02:00
Frederic Merizen
07b6089950 [Fix #2089] Add missing validation message 2018-06-12 16:36:26 +02:00
Mathieu Magnin
cd4615b10d When a new PJ is uploaded enqueue a anti virus scan job 2018-06-12 15:12:39 +02:00
Frederic Merizen
42765efb91 [#1946] Add validation to durees conservation 2018-06-01 16:46:39 +02:00
Frederic Merizen
c39a58749f Remove duplicate translations
There is a default translation for `blank` already
2018-06-01 15:21:25 +02:00
gregoirenovel
23931a7591 Remove the contact_email locale 2018-06-01 00:00:11 +02:00
gregoirenovel
185f08f63e Add constants for email addresses 2018-06-01 00:00:11 +02:00
simon lehericey
18ad227df5 [fix #1897] Procedure: can delete a deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
a96889310b Procedure: add legal reference 2018-05-31 16:55:31 +02:00
Paul Chavard
e2a126e37a Add users and gestionnaires to manager 2018-05-31 15:18:24 +02:00
gregoirenovel
661010100d [Fix #1536] Remove stringupcasepatch 2018-05-31 11:49:25 +02:00
simon lehericey
aaebcd3494 [fix #1701] Use DS form to enroll admin 2018-05-24 17:15:44 +02:00
Mathieu Magnin
aaf1bc0b99 [Fix #1931] User can ask support to delete dossier 2018-05-24 16:42:16 +02:00
simon lehericey
569da996d2 [fix #1915] enable devise paranoid mode 2018-05-23 16:11:03 +02:00
simon lehericey
6a69d958da Devise: move after_sign_up to after_confirmation 2018-05-23 15:55:52 +02:00
simon lehericey
5bd589344e Devise: confirm user email 2018-05-23 15:55:52 +02:00
Frederic Merizen
2b9721f1ee Mutualisation du message de validation blank 2018-05-23 15:55:14 +02:00
Frederic Merizen
3647cc5196 Remove translations for obsolete attributes 2018-05-23 15:55:14 +02:00
Paul Chavard
94d253c6dc Add commencer/test/:procedure_path route 2018-05-23 11:32:26 +02:00
gregoirenovel
a246181afd Add API_GEO_URL 2018-05-22 19:01:46 +02:00
gregoirenovel
1839269dd9 Add API_CARTO_URL 2018-05-22 18:53:34 +02:00
gregoirenovel
0b35bfffa5 Move constants to urls.rb 2018-05-22 17:35:11 +02:00
gregoirenovel
5757782d29 Fix the mentions legales link 2018-05-22 17:28:17 +02:00
gregoirenovel
a98ab683aa Update FAQ_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
de201fca04 Add FAQ_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
6ac8d6abf8 Update the DOC_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
b93ec30a2d Make the GitBook URLs depend on DOC_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
52d878fea8 Remove trailing slash from DOC_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
5126503cfc Add MENTIONS_LEGALES_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
dc962f0c0a Add LISTE_DES_DEMARCHES_URL 2018-05-22 17:23:56 +02:00
gregoirenovel
5e2219416e Add the DOC_URL constant 2018-05-22 17:23:56 +02:00
Frederic Merizen
11d83e7579 Add translations for flipflop
to avoid missing translation keys in feature screen in manager
2018-05-22 12:22:07 +02:00
simon lehericey
6b8a878ec1 Service: can be destroyed 2018-05-18 16:21:26 +02:00
simon lehericey
af7be58132 Service: add service to procedure 2018-05-18 16:21:26 +02:00
Frederic Merizen
365cb9b44d Service: can update a service 2018-05-18 16:21:26 +02:00
simon lehericey
c54c85bad8 Service: can create a service 2018-05-18 16:21:26 +02:00
simon lehericey
4d0a920e7a Service: add index page 2018-05-18 16:21:26 +02:00
Paul Chavard
da8ad1f3e2 Remove external scripts from mailjet widget 2018-05-17 13:27:27 +02:00
simon lehericey
46ba728d8a [fix #1913] force ssl and secure cookies 2018-05-09 16:36:01 +02:00
Mathieu Magnin
3e176d4e08 Remove use of staging.apientreprise 2018-05-09 13:56:29 +02:00
Mathieu Magnin
3e50903b66 [Fix #1873] Add pre maintenance warning 2018-05-02 16:52:38 +02:00
simon lehericey
959ff6be2c [fix #1902] decrease session timeout to 1 hour 2018-05-02 11:28:18 +02:00
simon lehericey
bb4d29ee8f [fix #1855] Gestionnaire: are now invited to create their password 2018-04-27 14:10:06 +02:00
Paul Chavard
d9dbf7b7f9 Remove legacy features support 2018-04-26 16:28:45 +02:00
gregoirenovel
47323ffbf1 [#1872] Managers can enable feature flags from UI 2018-04-26 16:28:45 +02:00
simon lehericey
3d53366678 [fix #1877] add maintenance mode 2018-04-26 15:06:34 +02:00
Paul Chavard
482b306920 Show enabled features for admins in manager 2018-04-25 15:42:45 +02:00
Frederic Merizen
5b9f25271f [Fix #1865] Expose attachment field over API 2018-04-24 20:29:25 +02:00
simon lehericey
366ef2d2b5 Procedure: add new preview view 2018-04-24 16:54:05 +02:00
Paul Chavard
4a2979f71e Enable weekly_overview only in production 2018-04-24 16:19:25 +02:00
gregoirenovel
049a2d88b9 Bump rails to 5.2 final 2018-04-24 16:07:19 +02:00
Paul Chavard
71c852fc85 Remove Feature 2018-04-18 16:51:21 +02:00
Paul Chavard
45019ce75c Use Flipflop instead of Feature 2018-04-18 16:51:21 +02:00
Paul Chavard
7dd0611a28 Add link to features UI to manager dashboard 2018-04-18 16:51:21 +02:00
Paul Chavard
3f3358db16 Add flipflop config 2018-04-18 16:51:21 +02:00
Paul Chavard
27592ae072 Add simple web hooks to procedures 2018-04-09 11:02:24 +02:00
gregoirenovel
c5953f8aef Use .join to generate urls (unification) 2018-04-09 09:54:10 +02:00
Paul Chavard
45ef32e6d9 Add SIRET Type De Champ 2018-04-05 10:29:29 +02:00
Paul Chavard
0b79a3d79d Add Siret(TypeDe)Champ STI model 2018-04-04 18:44:08 +02:00
Paul Chavard
714ebda2fe Add SignatureService 2018-04-04 18:44:08 +02:00
simon lehericey
b2f04e2503 Usager UI: simple dossier index 2018-03-29 16:23:10 +02:00
simon lehericey
d0431a28f2 Pipedrive: manager can refuse a deal 2018-03-27 15:56:28 +02:00
simon lehericey
6a74aaa42a [fix #1697] Pipedrive: use a job to process an admin creation 2018-03-27 14:52:39 +02:00
simon lehericey
ec3d558af0 Pipedrive: extract methods in service 2018-03-27 14:52:39 +02:00
simon lehericey
9eb28faa10 [fix #1601] accept demandes in manager 2018-03-22 15:37:16 +01:00
simon lehericey
9e566596fa [fix #1601] show pipedrive demandes in manager 2018-03-22 15:37:16 +01:00
gregoirenovel
57b42e24e5 SIADEURL -> API_ENTREPRISE_URL 2018-03-19 11:39:46 +01:00
gregoirenovel
658bd95f86 Add a constant to SIADEURL 2018-03-19 11:39:46 +01:00
gregoirenovel
ec3a1bd132 [Fix #1535] Remove super_admin.rb from Mina 2018-03-19 10:31:26 +01:00
Mathieu Magnin
e08f59ffb8 [Fix #1500] Use urls.rb from this repository 2018-03-15 14:37:13 +01:00
gregoirenovel
031b9c0bab Update documentation links to GitBook v2 2018-03-15 09:37:24 +01:00
Mathieu Magnin
247526578c [Fix #1479] Avis creation can fail gracefully 2018-03-14 17:41:46 +01:00
gregoirenovel
acc2ed5646 Move CGU_URL to a new initializer 2018-03-12 18:13:23 +01:00
gregoirenovel
657b9d2e93 Change link to doc 2018-03-12 17:51:39 +01:00
gregoirenovel
0a9f442260 Enable some Rails cops 2018-03-06 17:18:44 +01:00
gregoirenovel
e26f4148ff Bump development gems
- brakeman
- rubocop
- scss_lint
2018-03-06 16:17:22 +01:00
gregoirenovel
fe7f8da636 Revert "Bump development gems"
This reverts commit d6ad3fc3fd.
2018-03-06 15:11:26 +01:00
gregoirenovel
d6ad3fc3fd Bump development gems
- brakeman
- rubocop
- scss_lint
2018-03-06 10:36:35 +01:00
gregoirenovel
be5849a7f5 Remove unneeded quotes 2018-03-05 19:21:20 +01:00
gregoirenovel
ad2e418490 Change the cookie key 2018-03-01 10:33:53 +01:00
gregoirenovel
67da280fa0 Change logos that included “tps” 2018-03-01 10:33:53 +01:00
gregoirenovel
0af270faa0 tps.apientreprise.fr -> demarches-simplifiees.fr 2018-03-01 10:33:53 +01:00
gregoirenovel
fbe431f8dd Téléprocédures simplifiées -> demarches-simplifiees.fr 2018-03-01 10:33:53 +01:00
gregoirenovel
1b8b6a3274 TPS -> demarches-simplifiees.fr 2018-02-28 18:14:06 +01:00
simon lehericey
eb937649a1 new user: thanks page 2018-02-28 17:34:27 +01:00
simon lehericey
2a70ec9a25 Routes: add redirect from dossier/id to dossier/id/modifier 2018-02-28 11:57:47 +01:00
simon lehericey
d702a0c083 [fix #1411] user: new form ui 2018-02-27 15:24:50 +01:00
gregoirenovel
9c93000e69 [Fix #1468] Add Accessibilité page 2018-02-26 15:48:10 +01:00
gregoirenovel
7a26347253 [Ref #1170] Add basic_auth.yml to shared paths 2018-02-26 15:11:10 +01:00
simon lehericey
47ae94e0a0 Route: prefix gestionnaire routes 2018-02-22 17:02:20 +01:00
Paul Chavard
5470141ca4 Moulinette™ STI Champ et TypeDeChamp 2018-02-20 16:13:40 +01:00
Mathieu Magnin
9627ba43c0 [Fix #1409] Identite can be updated 2018-02-20 11:01:47 +01:00
Mathieu Magnin
d9265d9686 [Fix #1409] Display identite form with new design 2018-02-20 11:01:47 +01:00
Frederic Merizen
18db0ceae9 CleverCloud Cellar Compatible range query 2018-02-15 17:45:27 +01:00
Frederic Merizen
2012a19efa Disable content type detection for new attachments 2018-02-15 17:03:15 +01:00
gregoirenovel
732af26946 Override the conf for active_storage 2018-02-15 14:30:18 +01:00
gregoirenovel
93d8470321 Put the piece justificative champ behind a feature flag 2018-02-15 12:04:03 +01:00
gregoirenovel
071c459011 Slight refactor of the features flagging code 2018-02-15 11:15:24 +01:00
gregoirenovel
7097cad51a Add the “piece_justificative” type de champ 2018-02-15 11:14:03 +01:00
gregoirenovel
5c25b86c46 Add the ActiveStorage configuration 2018-02-15 11:14:03 +01:00
Frederic Merizen
fe4e57af6c [Fix #1389] Force French language
In #1383, a misconfigured gem was corrupting a global I18n variable
that was persisten across requests, resulting in #1389, #1392 and #1398.

This commit prevents future corruptions of locales.
2018-02-08 16:20:32 +01:00
Frederic Merizen
1dc413e313 [Fix #1383] Force french language for apidoc
Also fixes #1389, #1392 and #1398
2018-02-08 16:20:22 +01:00
Paul Chavard
8a55ac79f1 Remove global BROWSER and use browser helper 2018-02-05 10:35:51 +01:00
Frederic Merizen
d919d62cf7 [Fix #1012] Send dossier to other accompagnateur 2018-02-01 16:58:01 +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
ff87e09342 Disable assets precompile on CI 2018-01-31 16:11:49 +01:00
Mathieu Magnin
11dbc595c7 Store in constant CGU url 2018-01-29 11:08:19 +01:00
Mathieu Magnin
8b2fc0f8b4 Increase password creation delay 2018-01-29 10:50:32 +01:00
gregoirenovel
5723c4c894 Remove any reference to the SGMAP 2018-01-18 17:39:56 +01:00
Paul Chavard
e42626c588 Add user info to LogStasher 2018-01-18 17:14:42 +01:00
gregoirenovel
b138dcd876 Enable the Layout/SpaceInsideHashLiteralBraces cop 2018-01-18 10:53:35 +01:00
gregoirenovel
02ade68b38 Enable the Layout/SpaceInsideBrackets cop 2018-01-18 10:53:34 +01:00
Mathieu Magnin
307d7338e5 Remove unreachable code 2018-01-18 10:32:39 +01:00
Mathieu Magnin
11b055e07c Rename reinvite action in controller 2018-01-18 10:04:34 +01:00
Mathieu Magnin
98ae1bb95f Manager root is Administrateurs#index 2018-01-17 18:04:24 +01:00
Mathieu Magnin
d9feb4be06 Move sign_in behind /manager (not in namespace due to Administrate resources autoloading) 2018-01-17 18:04:23 +01:00
Mathieu Magnin
d5c036362b Remove old controller and templates 2018-01-17 18:04:23 +01:00
Mathieu Magnin
300ca8d9b2 Move delayed_job in new namespace 2018-01-17 18:04:22 +01:00
Mathieu Magnin
4f756975c7 Move administrateur#update in Administrate 2018-01-17 18:04:21 +01:00
Mathieu Magnin
a6be13ac5e Redirect if success, else render form with errors (https://github.com/thoughtbot/administrate/blob/master/app/controllers/administrate/application_controller.rb#L43) 2018-01-17 18:04:21 +01:00
Mathieu Magnin
67f89d5f86 Move administrateur creation in Administrate 2018-01-17 18:04:21 +01:00
simon lehericey
02dd1e209c FC ParticulierController: implement auto reconciliation based on user email 2018-01-17 16:37:26 +01:00
simon lehericey
7cbd6ed067 FC ParticulierController: create is private
yep, I know this is strange
2018-01-17 16:37:26 +01:00
gregoirenovel
a6b60faf9b [Fix #1266] Fix an incorrect legacy route redirection 2018-01-16 16:29:53 +01:00
gregoirenovel
80ed589a17 Use string interpolation 2018-01-16 11:08:57 +01:00
Paul Chavard
bbf55ab85e Create administrateurs with invitation link and no password 2018-01-16 10:49:07 +01:00
gregoirenovel
345b892956 Enable the Layout/LeadingCommentSpace cop 2018-01-15 22:33:13 +01:00
gregoirenovel
99a49a8144 Enable the Layout/IndentHeredoc cop 2018-01-15 22:33:13 +01:00
gregoirenovel
0be657c0d7 Enable the Layout/IndentHash cop 2018-01-15 22:33:12 +01:00
gregoirenovel
9e0e553f80 Enable the Layout/IndentArray cop 2018-01-15 22:33:12 +01:00
simon lehericey
4294c8eec7 Brakeman: make it happy 2018-01-15 17:14:12 +01:00
simon lehericey
b35a88ffd4 FC initializers: simplify 2018-01-15 17:14:12 +01:00
simon lehericey
f8519c5345 FC initializers: remove Hashie 2018-01-15 17:08:38 +01:00
Simon Lehericey
0d46f92795 FC: move FC constants under particulier namespace 2018-01-15 16:59:50 +01:00
gregoirenovel
1368cd4b03 [Fix #1120] Delete the old accompagnateur UI 2018-01-15 10:02:10 +01:00
gregoirenovel
7c34807f46 Don’t use unless 2018-01-12 11:32:43 +01:00
Mathieu Magnin
e3ec8643db In manager display libelles with line breaks 2018-01-11 11:03:34 +01:00
Mathieu Magnin
4c0592d631 Rails-ish route 2018-01-10 18:17:05 +01:00
gregoirenovel
289461d708 Handle the GitHub org rename: sgmap -> betagouv 2018-01-10 17:26:25 +01:00
simon lehericey
53687bf84a Whitelist: add whitelist button in admin 2018-01-10 17:18:44 +01:00
Mathieu Magnin
748b273496 [Fix #1205] Assets precompilation is forced during deployment 2018-01-10 15:32:52 +01:00
Mathieu Magnin
d8d2ecf515 [Fix #1098] Administrateur dashboard 2018-01-10 13:44:02 +01:00
Mathieu Magnin
d0de9b9ae2 [Fix #1098] Add procedures dashboard 2018-01-10 13:44:00 +01:00
Mathieu Magnin
04e9f7be3e [Fix #1149] Move avis actions to new gestionnaire controller 2018-01-08 16:50:15 +01:00
gregoirenovel
bf5e21d6de [Fix #1182] Add a “create new procedure from an existing one” feature 2018-01-08 14:55:07 +01:00
Mathieu Magnin
62d8381ef7 Remove will paginate 2018-01-03 14:35:48 +01:00
Mathieu Magnin
98ac496aa5 [Fix #1100] Administrateur can renew his API Token 2017-12-26 18:30:36 +01:00
Mathieu Magnin
4990595430 [Fix #1096] Sign in with GitHub page 2017-12-22 11:10:24 +01:00
Mathieu Magnin
7c0fdbc9f8 [Fix #1096] Github Oauth 2017-12-22 11:10:24 +01:00
gregoirenovel
84b05a348e [Fix #525] Improve the wording of the attestation template footer label 2017-12-20 19:57:31 +01:00
Simon Lehericey
c83552f423 [fix #504] Dossier: without_continuation -> sans_suite 2017-12-15 12:10:54 +01:00
Simon Lehericey
2be9b8d2ba [fix #504] Dossier: refused -> refuse 2017-12-15 12:10:54 +01:00
Simon Lehericey
a13256f73d [fix #504] Dossier: closed -> accepte 2017-12-15 12:10:54 +01:00
LeSim
3dda27b281 [fix #504] Dossier: received -> en_instruction 2017-12-15 12:10:54 +01:00
Simon Lehericey
72bae2c374 [fix #504] Dossier: draft -> brouillon 2017-12-15 11:52:09 +01:00
LeSim
56545933a9 [fix #504] Dossier: initiated -> en_construction
The change must not impact the api
2017-12-15 11:52:09 +01:00
Simon Lehericey
982ad3da42 [Fix #1060] fix tag in api documentation title 2017-12-11 16:09:58 +01:00
Simon Lehericey
83d9831183 [fix #1046] Update api entreprise host 2017-12-11 16:02:57 +01:00
gregoirenovel
0d22ecfe5a Delete the CGU-related files and mentions 2017-12-07 16:15:44 +01:00
gregoirenovel
d75a3872d1 [Fix #963] Add a "personnes impliquées" tab 2017-12-05 17:04:17 +01:00
gregoirenovel
2e5a0f5026 Remove the newrelic gem and configuration 2017-12-04 10:33:41 +01:00
gregoirenovel
a04af24cbf Add DossiersController#terminer 2017-12-01 14:28:07 +01:00
gregoirenovel
a5b4b20a7d Add DossiersController#repasser_en_construction 2017-12-01 14:28:07 +01:00
gregoirenovel
eb55dfc0c8 Add and use DossiersController#passer_en_instruction 2017-12-01 14:28:07 +01:00
gregoirenovel
731e1b6787 [Fix #164] Make the organisme field mandatory 2017-11-29 10:36:22 +01:00
Mathieu Magnin
6c39aba978 Validates commentaire file size 2017-11-28 15:07:10 +01:00
Mathieu Magnin
b16366f2fd Disable Skylight in staging 2017-11-23 18:18:23 +01:00
gregoirenovel
5361e4e1e9 [Fix #871] Add the date at the end of exported files 2017-11-22 17:27:57 +01:00
gregoirenovel
c8e62ad095 recherches -> recherche 2017-11-22 10:48:38 +01:00
gregoirenovel
962f1d63ba Enable skylight in staging 2017-11-16 18:10:42 +01:00
gregoirenovel
3796a0ab97 Add path to shared skylight conf file 2017-11-16 17:52:02 +01:00
Mathieu Magnin
b187e7163a Remove demo accounts routes 2017-11-16 12:36:58 +01:00
Mathieu Magnin
adaa1e0dec [Fix #939] Remove demo page in staging 2017-11-10 18:19:41 +01:00