Merge branch 'release/0.3.5'

0.3.5
Merge tag '0.3.4' into develop
2019-02-19 11:30:55 +07:00 · 2019-02-19 11:30:24 +07:00 · 2019-02-19 11:25:36 +07:00 · 2019-02-19 11:25:26 +07:00 · 2019-02-19 11:25:10 +07:00 · 2019-02-19 11:23:37 +07:00
5 changed files with 6 additions and 6 deletions
--- a/docs/omnireader/old/config/config.js
+++ b/docs/omnireader/old/config/config.js
@@ -1,2 +1,2 @@
-	siteroot = 'http://omnireader.ru:11080/';
+	siteroot = 'http://old.omnireader.ru/';
 	doRedirect = '';
--- a/docs/omnireader/old/config/config.php
+++ b/docs/omnireader/old/config/config.php
@@ -1,5 +1,5 @@
 <?php
-    $siteroot = 'http://omnireader.ru:11080/';
+    $siteroot = 'http://old.omnireader.ru/';
    $use_gzip = false;
    $tmp_dir = '/tmp';
 ?>
--- a/docs/omnireader/old/index.html
+++ b/docs/omnireader/old/index.html
@@ -156,7 +156,7 @@
 				Ïîääåðæèâàåìûå ôîðìàòû: <strong>html, txt, fb2, fb2.zip</strong>
 		<br><br>Âû ìîæåòå äîáàâèòü â ñâîé áðàóçåð çàêëàäêó, óêàçàâ â åå ñâîéñòâàõ âìåñòî àäðåñà ñëåäóþùèé êîä:
-		<br><p><strong>javascript:location.href='http://omnireader.ru:11080/?url='+location.href;</strong>
+		<br><p><strong>javascript:location.href='http://old.omnireader.ru/?url='+location.href;</strong>
 		<br>Òîãäà, íàæàâ íà ïîëó÷èâøóþñÿ êíîïêó íà ëþáîé ñòðàíèöå èíòåðíåòà, âû àâòîìàòè÷åñêè îòêðîåòå åå â Omni Reader.
 		<br><br>Äëÿ Chrome íà Android ìîæíî âûçûâàòü çàêëàäêó ïî åå èìåíè (èìÿ ñòîèò ñäåëàòü ïîïðîùå) â àäðåñíîé ñòðîêå áðàóçåðà, ïîñêîëüêó ñòàíäàðòíûé âûçîâ òàêîé çàêëàäêè íå ðàáîòàåò.
--- a/docs/omnireader/omnireader
+++ b/docs/omnireader/omnireader
@@ -25,8 +25,8 @@ server {
 }
 server {
-  listen 11080;
+  listen 80;
-  server_name omnireader.ru;
+  server_name old.omnireader.ru;
  client_max_body_size 50m;
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "Liberama",
-  "version": "0.3.3",
+  "version": "0.3.5",
  "engines": {
    "node": ">=10.0.0"
  },
Author	SHA1	Message	Date
Book Pauk	fd1dd54b99	Merge branch 'release/0.3.5'	2019-02-19 11:30:55 +07:00
Book Pauk	32cbb2a82c	0.3.5	2019-02-19 11:30:24 +07:00
Book Pauk	048b7c08ca	Merge tag '0.3.4' into develop 0.3.4	2019-02-19 11:25:36 +07:00
Book Pauk	d98251e34a	Merge branch 'release/0.3.4'	2019-02-19 11:25:26 +07:00
Book Pauk	1eea4e8fc1	0.3.4	2019-02-19 11:25:10 +07:00
Book Pauk	da330bc615	Вместо omnireader.ru:11080 будет old.omnireader.ru	2019-02-19 11:23:37 +07:00
Book Pauk	1134250954	Merge tag '0.3.3' into develop 0.3.3	2019-02-19 02:37:43 +07:00
`@@ -1,2 +1,2 @@`
	`siteroot = 'http://omnireader.ru:11080/';`	`siteroot = 'http://old.omnireader.ru/';`
	`doRedirect = '';`	`doRedirect = '';`