Merge branch 'develop'

Conf: update makefile and gitignore
2018-06-27 15:29:04 +02:00 · 2018-06-27 15:28:59 +02:00 · 2018-06-27 14:56:12 +02:00 · 2018-06-27 11:13:24 +02:00 · 2018-06-27 10:41:02 +02:00 · 2018-06-27 10:40:40 +02:00
5 changed files with 38 additions and 4 deletions
@@ -8,3 +8,5 @@
 /backup
 /conf/env/*.env
 volume/www/website/.idea
+/volume/www/website/store/themes/talentstube-20170413/cache/*
+/volume/www/website/store/img/tmp/*
@@ -84,7 +84,7 @@ db-restore-website:

 db-restore-store:
 	@echo "Restoring file to database (backup/store-mysql.sql)"
-	@docker exec -i $(CLIENT).mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql
+	@docker exec -i $(CLIENT).store-mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql

 cc:
 	@echo "Clearing symfony cache"
@@ -27,4 +27,4 @@

 {% block metarobot %}
    <meta name="robots" content="noindex,nofollow">
-{% endblock %}
+{% endblock %}
@@ -53,7 +53,7 @@
                </p>
                <h5 class="white-text">Contactez-nous !</h5>
                <a class="white-text" href="mailto:&#098;&#111;&#110;&#106;&#111;&#117;&#114;&#064;&#116;&#097;&#108;&#101;&#110;&#116;&#115;&#116;&#117;&#098;&#101;&#046;&#099;&#111;&#109;">Par mail</a>
-                <p class="white-text" >02 97 68 14 02</p>
+                <p class="white-text">02 30 05 06 31</p>
                <p class="footer-newsletter">
                    <a class="btn-large btn-round" href="#" title="Newsletter" data-token="ecea5416671e97e3abfa8195848a9140" onclick="mjOpenPopin(event, this)">
                        <i class="fa fa-envelope-open-o left" aria-hidden="true"></i>
@@ -64,7 +64,11 @@
        </div>
        <div class="row footer-more-links">
            <div class="col s12 center-align">
-                <a class="text-center white-text" href="https://www.e-declic.com" target="_blank" title="Agence Web">&copy;&nbsp;2017 Talents Tube</a>
+                <p class="text-center white-text">Entreprise soutenue par</p>
+                <a href="https://www.bretagne.bzh/"><img src="{{ asset('img/RB_monochrome_blanc.svg')}}" alt="Region Bretagne"></a><br>
+            </div>
+            <div class="col s12 center-align m-t-30">
+                <a class="text-center white-text" href="https://www.e-declic.com" target="_blank" title="Agence Web">&copy;&nbsp;2018 Talents Tube</a>
            </div>
        </div>
    </div>
Author	SHA1	Message	Date
Maxime Thévenot	47d9a08311	Merge branch 'develop'	2018-06-27 15:29:04 +02:00
Maxime Thévenot	2072f1f231	Conf: update makefile and gitignore	2018-06-27 15:28:59 +02:00
Maxime Thévenot	a55828306a	Merge branch 'develop'	2018-06-27 14:56:12 +02:00
Maxime Thévenot	2757340f8e	Feat : update footer	2018-06-27 11:13:24 +02:00
Maxime Thévenot	6ef1ab86c1	Fix: bad typo in wording	2018-06-27 10:41:02 +02:00
Maxime Thévenot	76fa1bdb59	Feat : change phone number and add RB image to resources	2018-06-27 10:40:40 +02:00
Maxime Thévenot	1e199008b3	Merge branch 'master' into develop # Conflicts: # volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig	2018-06-08 12:15:11 +02:00
Thomas MONCHICOURT	1cf0e33b07	Fix: recherceh url	2018-06-05 15:26:37 +02:00
Thomas MONCHICOURT	fbfadf425f	Fix : optimisation mobile css	2018-06-05 15:26:37 +02:00
Thomas MONCHICOURT	2d097a0424	Fix : style detail annonce	2018-06-05 15:26:36 +02:00
Thomas MONCHICOURT	27963ab492	Fix : du fix …	2018-06-05 15:26:36 +02:00
Maxime Thévenot	c801d92143	Fix : redirection when creating account after spontaneous	2018-06-05 14:32:04 +02:00