Commit 75049996 authored by Simonas's avatar Simonas

Merge branch 'release-1.7.0' into dev

parents 2f575524 ae8cce70
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
## Production ## Production
- build CSS & JS assets - `C:\web\dev.biuro\ npm run build` - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
- build new image `docker build -t biuro/web:1.6.13 .` (update version number) - build new image `docker build -t biuro/web:1.7.0 .` (update version number)
- login to biuro docker account `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs` - login to biuro docker account `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
- push image to docker repository - `docker push biuro/web:1.6.13` - push image to docker repository - `docker push biuro/web:1.7.0`
## Production ## Production
- update biuro/web image version in .env file (staging or www) - update biuro/web image version in .env file (staging or www)
......
{ {
"name": "biuro", "name": "biuro",
"version": "1.6.13", "version": "1.7.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
......
{ {
"name": "biuro", "name": "biuro",
"version": "1.6.13", "version": "1.7.0",
"description": "Biuro WP theme", "description": "Biuro WP theme",
"scripts": { "scripts": {
"dev": "gulp --require @babel/register --gulpfile tasks", "dev": "gulp --require @babel/register --gulpfile tasks",
......
...@@ -28,18 +28,6 @@ get_header(); ?> ...@@ -28,18 +28,6 @@ get_header(); ?>
</p> </p>
</div> </div>
<?php
/*
<div class="c-404">
<p class="c-404--heading">404</p>
<p class="c-404--message">Atsiprašome, bet puslapis kurio jūs ieškote neegzistuoja!</p>
<p>
<a href="<?php echo pll_home_url(); ?>" class="o-btn c-btn--main">Grįžti į pagrindinį puslapį</a>
</p>
</div>
*/
?>
</main><!-- .l-main --> </main><!-- .l-main -->
</div><!-- #content --> </div><!-- #content -->
......
...@@ -3,6 +3,6 @@ Theme Name: Biuro ...@@ -3,6 +3,6 @@ Theme Name: Biuro
Author: Biuro Author: Biuro
Author URI: https://www.biuro.lt/ Author URI: https://www.biuro.lt/
Description: Biuro multiregion theme Description: Biuro multiregion theme
Version: 1.6.13 Version: 1.7.0
Text Domain: biuro Text Domain: biuro
*/ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment