From 4b37a388576cb8cee8c332391834d65a3035faf6 Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 9 Sep 2018 10:58:18 +0100 Subject: [PATCH 1/4] viewports argh --- ext/rule34/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/rule34/script.js b/ext/rule34/script.js index aebda614..b8aef7cf 100644 --- a/ext/rule34/script.js +++ b/ext/rule34/script.js @@ -51,7 +51,7 @@ var forceDesktop = false; function toggleDesktop() { if(forceDesktop) { var viewport = document.querySelector("meta[name=viewport]"); - viewport.setAttribute('content', 'width=512, initial-scale=1.0'); + viewport.setAttribute('content', 'width=512'); Cookies.set("ui-desktop", "false"); } else { From de2a688b5a8c88e7358fd4eeaa56daa22f403543 Mon Sep 17 00:00:00 2001 From: Shish Date: Sat, 10 Nov 2018 12:02:48 +0000 Subject: [PATCH 2/4] php... --- core/page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/page.php b/core/page.php index e223500e..e16194a7 100644 --- a/core/page.php +++ b/core/page.php @@ -337,7 +337,7 @@ class Page { $css_files = array_merge( zglob("lib/shimmie.css"), zglob("ext/{".ENABLED_EXTS."}/style.css"), - zglob("themes/$theme_name/style.css"), + zglob("themes/$theme_name/style.css") ); foreach($css_files as $css) { $css_latest = max($css_latest, filemtime($css)); From c74bd5820761e43c7b55ae39e4d00c089b3b2bf9 Mon Sep 17 00:00:00 2001 From: Shish Date: Sat, 10 Nov 2018 12:03:05 +0000 Subject: [PATCH 3/4] sort image reports by id (newest first) --- ext/report_image/main.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/report_image/main.php b/ext/report_image/main.php index 8cf510f4..0f670bc0 100644 --- a/ext/report_image/main.php +++ b/ext/report_image/main.php @@ -209,7 +209,8 @@ class ReportImage extends Extension { $all_reports = $database->get_all(" SELECT image_reports.*, users.name AS reporter_name FROM image_reports - JOIN users ON reporter_id = users.id"); + JOIN users ON reporter_id = users.id + ORDER BY image_reports.id DESC"); if(is_null($all_reports)) $all_reports = array(); $reports = array(); From b38ec11b64b7e098c0994c8f06fe46a17414535a Mon Sep 17 00:00:00 2001 From: Shish Date: Sat, 10 Nov 2018 12:43:53 +0000 Subject: [PATCH 4/4] is this syntax? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d7dea99..a8c9da57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ install: fi - if [[ "$DB" == "sqlite" ]]; then echo ' data/config/auto_install.conf.php ; - fi + fi - composer install - php index.php