mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 03:35:13 +00:00
Merge branch 'dev' of /home/macgirvin/streams into dev
This commit is contained in:
commit
8bb7dcfcb4
3 changed files with 15 additions and 11 deletions
14
boot.php
14
boot.php
|
@ -62,12 +62,6 @@ require_once('include/dba/dba_driver.php');
|
||||||
|
|
||||||
function sys_boot() {
|
function sys_boot() {
|
||||||
|
|
||||||
// Optional startup file for situations which require system
|
|
||||||
// configuration before anything is executed.
|
|
||||||
if (file_exists('.htstartup.php')) {
|
|
||||||
/** @noinspection PhpIncludeInspection */
|
|
||||||
include('.htstartup.php');
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!file_exists('.htaccess')) {
|
if(!file_exists('.htaccess')) {
|
||||||
Stdio::fcopy('htaccess.dist', '.htaccess');
|
Stdio::fcopy('htaccess.dist', '.htaccess');
|
||||||
|
@ -275,6 +269,14 @@ class App {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public static function init() {
|
public static function init() {
|
||||||
|
|
||||||
|
// Optional startup file for situations which require system
|
||||||
|
// configuration before anything is executed.
|
||||||
|
if (file_exists('.htstartup.php')) {
|
||||||
|
/** @noinspection PhpIncludeInspection */
|
||||||
|
include('.htstartup.php');
|
||||||
|
}
|
||||||
|
|
||||||
// we'll reset this after we read our config file
|
// we'll reset this after we read our config file
|
||||||
date_default_timezone_set('UTC');
|
date_default_timezone_set('UTC');
|
||||||
|
|
||||||
|
|
|
@ -165,10 +165,12 @@ a.wall-item-name-link {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wall-item-content {
|
/*@media screen and (min-width: 992px) {*/
|
||||||
overflow-y: auto;
|
.wall-item-content {
|
||||||
max-height: 400px;
|
overflow-y: auto;
|
||||||
}
|
max-height: 400px;
|
||||||
|
}
|
||||||
|
/*}*/
|
||||||
|
|
||||||
.wall-item-content img {
|
.wall-item-content img {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
|
|
@ -17,7 +17,7 @@ let last_popup_button = null;
|
||||||
let scroll_next = false;
|
let scroll_next = false;
|
||||||
let next_page = 1;
|
let next_page = 1;
|
||||||
let page_load = true;
|
let page_load = true;
|
||||||
let loadingPage = true;
|
let loadingPage = false;
|
||||||
let pageHasMoreContent = true;
|
let pageHasMoreContent = true;
|
||||||
let divmore_height = 400;
|
let divmore_height = 400;
|
||||||
let last_filestorage_id = null;
|
let last_filestorage_id = null;
|
||||||
|
|
Loading…
Reference in a new issue