Commit b6d00b2c authored by Dominik George's avatar Dominik George

New upstream version 0.14.2~rc5

parent 1c54e6e3

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -12,7 +12,7 @@ v0.14.2 (trunk)
* Allow users to set a local nickname and handle blog urls with this nickname
* Fix "Forever composing" (#130) + ids for composing/paused states
* Add support of XEP-0367: Message Attaching, add Reactions feature in Movim
* Add zlib compression in the websocket (using pako.js for the decompression)
* Move the index.php file to the public/ subfolder and all the assets bellow it
v0.14.1
---------------------------
......
......@@ -34,6 +34,7 @@ You can also use Movim on our official Pods:
* https://nl.movim.eu/ server hosted in The Netherlands
* https://fi.movim.eu/ server hosted in Finland
* https://jp.mov.im/ server hosted in Japan
* https://de.movim.eu server host in Germany
Translations
------------
......
0.14.2rc4
0.14.2rc5
This diff is collapsed.
......@@ -385,3 +385,10 @@ function urilize($path, bool $noTime = false): string
return BASE_URI . $path . '?t=' . filemtime(DOCUMENT_ROOT . '/' . $path);
}
/**
* Return a comma-separated list of joined array elements
*/
function implodeCsv($value) {
return implode(', ', $value);
}
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title><?php $this->title(); ?></title>
<head>
<meta charset="utf-8" />
<title><%title%></title>
<meta name="theme-color" content="#1C1D5B" />
<?php $this->meta(); ?>
<meta name="application-name" content="<?php echo APP_TITLE; ?>">
<link rel="manifest" href="<?php echo \Movim\Route::urlize('manifest'); ?>" />
<link rel="shortcut icon" href="<?php $this->linkFile('img/favicon.ico');?>" />
<link rel="icon" type="image/png" href="<?php $this->linkFile('img/app/48.png');?>" sizes="48x48">
<link rel="icon" type="image/png" href="<?php $this->linkFile('img/app/96.png');?>" sizes="96x96">
<link rel="icon" type="image/png" href="<?php $this->linkFile('img/app/128.png');?>" sizes="128x128">
<script src="<?php echo BASE_URI; ?>app/assets/js/favico.js"></script>
<script src="<?php echo BASE_URI; ?>app/assets/js/pako.js"></script>
<script src="<?php echo
\Movim\Route::urlize('system') .
'&t=' .
filemtime(CACHE_PATH . 'websocket');
?>"></script>
<meta name="viewport" content="width=device-width, user-scalable=no">
<?php
$this->addCSS('style.css');
$this->addCSS('notification.css');
$this->addCSS('header.css');
$this->addCSS('listn.css');
$this->addCSS('grid.css');
$this->addCSS('article.css');
$this->addCSS('form.css');
$this->addCSS('icon.css');
$this->addCSS('dialog.css');
$this->addCSS('card.css');
$this->addCSS('table.css');
$this->addCSS('color.css');
$this->addCSS('block.css');
$this->addCSS('menu.css');
$this->addCSS('fonts.css');
$this->addCSS('title.css');
$this->addCSS('typo.css');
$this->addCSS('scrollbar.css');
$this->scripts();
?>
<meta name="theme-color" content="#1C1D5B" />
<%meta%>
<meta name="application-name" content="<?php echo APP_TITLE; ?>">
<link rel="manifest" href="<?php echo \Movim\Route::urlize('manifest'); ?>" />
<link rel="shortcut icon" href="<?php $this->linkFile('img/favicon.ico');?>" />
<link rel="icon" type="image/png" href="<?php $this->linkFile('img/app/48.png');?>" sizes="48x48">
<link rel="icon" type="image/png" href="<?php $this->linkFile('img/app/96.png');?>" sizes="96x96">
<link rel="icon" type="image/png" href="<?php $this->linkFile('img/app/128.png');?>" sizes="128x128">
<script src="<?php echo BASE_URI; ?>scripts/favico.js"></script>
<script src="<?php echo
\Movim\Route::urlize('system') .
'&t=' .
filemtime(CACHE_PATH . 'websocket');
?>"></script>
<meta name="viewport" content="width=device-width, user-scalable=no">
<%scripts%>
</head>
<body dir="<?php $this->dir();?>"
<body dir="<%dir%>"
class="<?php if (!$this->public && \App\User::me()->nightmode) { ?>nightmode<?php } ?>">
<?php if ($this->js_check) { ?>
<noscript>
......@@ -75,6 +51,6 @@
<?php $this->widget('Drawer');?>
<?php $this->widget('Preview');?>
<?php $this->widget('Confirm');?>
<?php $this->content();?>
<%content%>
</body>
</html>
{loop="$reactions"}
<li title="{$value|implode:', '}"
<li title="{$value|implodeCsv}"
{if="in_array($me, $value)"}class="reacted"{/if}
onclick="Chat_ajaxHttpSendReaction('{$message->mid}', '{$key}')">
{autoescape="off"}
......
This diff is collapsed.
......@@ -9,7 +9,7 @@ body main {
@media screen and (max-width: 600px) {
body main {
background: url(img/logo_cloud.svg), radial-gradient(circle farthest-corner at right bottom,#5265ce 0,#213399 100%);
background: url(/theme/img/logo_cloud.svg), radial-gradient(circle farthest-corner at right bottom,#5265ce 0,#213399 100%);
background-size: auto 2.6rem, 100% 100%;
background-position: center 2.25rem, center ;
background-repeat: no-repeat;
......@@ -31,7 +31,7 @@ body main {
}
#login_widget footer > *:first-child {
background-image: url(img/logo.svg);
background-image: url(/theme/img/logo.svg);
background-repeat: no-repeat;
background-position: center 0;
background-size: 22rem auto, 100% 100%;
......
......@@ -6,13 +6,13 @@
}
#onboarding.notifications .placeholder {
background-image: url(img/notifications.svg);
background-image: url(/theme/img/notifications.svg);
}
#onboarding.public .placeholder {
background-image: url(img/public.svg);
background-image: url(/theme/img/public.svg);
}
#onboarding.popups .placeholder {
background-image: url(img/popups.svg);
background-image: url(/theme/img/popups.svg);
}
......@@ -28,9 +28,11 @@ class Post extends Base
$post = $packet->content;
if ($post->isComment()) {
$parent = $post->getParent();
$this->rpc(
'MovimTpl.fill',
'#comments',
'#post_widget.'.cleanupId($parent->nodeid).' #comments',
$this->prepareComments($post->getParent())
);
} else {
......@@ -59,7 +61,14 @@ class Post extends Base
public function onComments($packet)
{
$post = \App\Post::find($packet->content);
$this->rpc('MovimTpl.fill', '#comments', $this->prepareComments($post));
if ($post) {
$this->rpc(
'MovimTpl.fill',
'#post_widget.'.cleanupId($post->nodeid).' #comments',
$this->prepareComments($post)
);
}
}
public function onCommentsError($packet)
......
......@@ -27,7 +27,7 @@ class Stickers extends \Movim\Widget\Base
list($c, $ext) = explode('@', $cid);
list($sh, $key) = explode('+', $c);
$base64 = base64_encode(file_get_contents(CACHE_PATH.md5($key).'.png'));
$base64 = base64_encode(file_get_contents(PUBLIC_CACHE_PATH.md5($key).'.png'));
$a = new Answer;
$a->setTo($to)
......@@ -46,15 +46,15 @@ class Stickers extends \Movim\Widget\Base
list($key, $ext) = explode('.', $file);
$filepath = dirname(__FILE__).'/stickers/'.$pack.'/'.$key.'.png';
$filepath = PUBLIC_PATH.'/stickers/'.$pack.'/'.$key.'.png';
if (!file_exists($filepath)) {
return;
}
// Caching the picture
if (!file_exists(CACHE_PATH.md5($key).'.png')) {
copy($filepath, CACHE_PATH.md5($key).'.png');
if (!file_exists(PUBLIC_CACHE_PATH.md5($key).'.png')) {
copy($filepath, PUBLIC_CACHE_PATH.md5($key).'.png');
}
// Creating a message
......@@ -108,7 +108,7 @@ class Stickers extends \Movim\Widget\Base
$pack = isset($pack) ? $pack : current($packs);
if (in_array($pack, $packs)) {
$files = scandir(dirname(__FILE__).'/stickers/'.$pack);
$files = scandir(PUBLIC_PATH.'/stickers/'.$pack);
array_shift($files);
array_shift($files);
......@@ -118,7 +118,7 @@ class Stickers extends \Movim\Widget\Base
$view->assign('stickers', $files);
$view->assign('packs', $packs);
$view->assign('pack', $pack);
$view->assign('info', parse_ini_file(dirname(__FILE__).'/stickers/'.$pack.'/info.ini'));
$view->assign('info', parse_ini_file(PUBLIC_PATH.'/stickers/'.$pack.'/info.ini'));
$view->assign('path', $this->respath('stickers', false, false, true));
Drawer::fill($view->draw('_stickers'), true);
......@@ -169,7 +169,7 @@ class Stickers extends \Movim\Widget\Base
*/
public function getPacks()
{
$dirs = scandir(dirname(__FILE__).'/stickers/');
$dirs = scandir(PUBLIC_PATH.'/stickers/');
$packs = [];
......@@ -178,7 +178,7 @@ class Stickers extends \Movim\Widget\Base
// Get the packs
foreach ($dirs as $dir) {
if (is_dir(dirname(__FILE__).'/stickers/'.$dir)) {
if (is_dir(PUBLIC_PATH.'/stickers/'.$dir)) {
array_push($packs, $dir);
}
}
......
......@@ -3,7 +3,7 @@
{loop="$stickers"}
{if="strlen($value) == 44"}
<li class="block" onclick="Stickers.zoom(this, '{$jid}', '{$pack}', '{$value}');">