From 81995558160a440082fd0adebbb5cb4eefb312fe Mon Sep 17 00:00:00 2001 From: src386 Date: Mon, 30 May 2016 10:41:49 +0200 Subject: [PATCH] update to movim upstream --- CHANGELOG | 2 +- README.md | 2 +- sources/CHANGELOG.md | 4 + sources/app/models/contact/ContactDAO.php | 15 +- sources/app/views/page.tpl | 2 + sources/app/widgets/AdHoc/_adhoc_form.tpl | 2 +- sources/app/widgets/Chat/Chat.php | 7 +- sources/app/widgets/Chat/_chat.tpl | 19 ++- sources/app/widgets/Chat/chat.js | 7 +- sources/app/widgets/Chat/locales.ini | 1 + sources/app/widgets/Chats/chats.js | 1 + .../app/widgets/Group/_group_subscribe.tpl | 45 +++--- sources/app/widgets/Login/login.css | 2 +- sources/app/widgets/Menu/_menu_list.tpl | 14 +- .../app/widgets/Notification/notification.js | 4 +- sources/app/widgets/Rooms/Rooms.php | 17 ++ sources/app/widgets/Rooms/_rooms_add.tpl | 46 ++++-- sources/app/widgets/Rooms/locales.ini | 1 + sources/app/widgets/Search/Search.php | 1 + .../app/widgets/Search/_search_results.tpl | 10 +- sources/app/widgets/Stickers/_stickers.tpl | 2 + sources/composer.lock | 28 ++-- sources/daemon.php | 2 +- sources/lib/XMPPtoForm.php | 31 ++-- sources/locales/ach.po | 40 ++++- sources/locales/ady.po | 40 ++++- sources/locales/af.po | 40 ++++- sources/locales/ar.po | 44 +++++- sources/locales/be.po | 40 ++++- sources/locales/bg.po | 40 ++++- sources/locales/bn.po | 41 ++++- sources/locales/br.po | 44 +++++- sources/locales/ca.po | 42 ++++- sources/locales/da.po | 46 +++++- sources/locales/de.po | 46 +++++- sources/locales/el.po | 45 +++++- sources/locales/en.po | 46 +++++- sources/locales/eo.po | 41 ++++- sources/locales/es.po | 46 +++++- sources/locales/fa.po | 41 ++++- sources/locales/fi.po | 44 +++++- sources/locales/fr.po | 48 +++++- sources/locales/ga.po | 40 ++++- sources/locales/gl.po | 41 ++++- sources/locales/he.po | 47 +++++- sources/locales/hr.po | 40 ++++- sources/locales/hu.po | 45 +++++- sources/locales/id.po | 45 +++++- sources/locales/io.po | 42 ++++- sources/locales/is.po | 44 +++++- sources/locales/it.po | 45 +++++- sources/locales/ja.po | 45 +++++- sources/locales/jbo.po | 40 ++++- sources/locales/kk.po | 40 ++++- sources/locales/la.po | 40 ++++- sources/locales/lb.po | 40 ++++- sources/locales/lv.po | 43 ++++- sources/locales/lzh.po | 40 ++++- sources/locales/messages.pot | 40 ++++- sources/locales/ne.po | 40 ++++- sources/locales/nl.po | 46 +++++- sources/locales/no.po | 40 ++++- sources/locales/oc.po | 46 +++++- sources/locales/pl.po | 46 +++++- sources/locales/pt.po | 44 +++++- sources/locales/ro.po | 40 ++++- sources/locales/ru.po | 47 +++++- sources/locales/sv.po | 43 ++++- sources/locales/tr.po | 44 +++++- sources/locales/uk.po | 43 ++++- sources/locales/zh.po | 48 +++++- sources/themes/material/css/article.css | 60 ------- sources/themes/material/css/color.css | 86 +++++----- sources/themes/material/css/dialog.css | 5 + sources/themes/material/css/form.css | 7 +- sources/themes/material/css/listn.css | 2 + sources/themes/material/css/style.css | 103 +----------- sources/themes/material/css/table.css | 3 +- sources/themes/material/css/title.css | 18 ++- sources/themes/material/css/typo.css | 148 ++++++++++++++++++ 80 files changed, 2235 insertions(+), 480 deletions(-) create mode 100644 sources/themes/material/css/typo.css diff --git a/CHANGELOG b/CHANGELOG index 8953311..3aca93b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ **Changelog** 1.9 2016-* -- Update to movim 0.9 git2016-05-19 +- Update to movim 0.9 git2016-05-30 1.8 2016-04-15 - Update to movim 0.9 git2016-04-15 diff --git a/README.md b/README.md index f31d512..ba64943 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t It is recommended to use a "valid" certificate to use Movim, auto-signed is sometimes problematic. You might want to take a look a StartSSL or Let's Encrypt. -Provided Movim version : 0.9 git2016-05-19 +Provided Movim version : 0.9 git2016-05-30 Please read CHANGELOG. diff --git a/sources/CHANGELOG.md b/sources/CHANGELOG.md index a17dba8..4bf22b7 100644 --- a/sources/CHANGELOG.md +++ b/sources/CHANGELOG.md @@ -3,8 +3,12 @@ Movim Changelog v0.9.1 (trunk) --------------------------- + * Fix behaviour for Android and Electron packages * Fix Pubsub metadata handling for some XMPP servers + * Add global search * Add silent notifications for chatrooms + * Add alternate nickname support (adding "_") when joining a chatroom + * Allow room configuration edition * Put your own XMPP server as default in the configuration (movim.eu in fallback) * Close the Dialog box when pressing ESC * Moving values from Sessionx to Session diff --git a/sources/app/models/contact/ContactDAO.php b/sources/app/models/contact/ContactDAO.php index dbd5810..4bb1902 100644 --- a/sources/app/models/contact/ContactDAO.php +++ b/sources/app/models/contact/ContactDAO.php @@ -493,9 +493,22 @@ class ContactDAO extends SQL { rosterlink.rostername, rosterlink.rostersubscription, rosterlink.groupname, - rosterlink.chaton + rosterlink.chaton, + presence.value, + presence.delay, + presence.last from rosterlink left outer join contact + left outer join ( + select a.* + from presence a + join ( + select jid, min( id ) as id + from presence + where session = :session + group by jid + ) as b on ( a.id = b.id ) + ) presence on contact.jid = presence.jid on rosterlink.jid = contact.jid where rosterlink.session = :session and (rosterlink.jid like :jid diff --git a/sources/app/views/page.tpl b/sources/app/views/page.tpl index 0392ca8..e889e29 100644 --- a/sources/app/views/page.tpl +++ b/sources/app/views/page.tpl @@ -32,6 +32,8 @@ $this->addCss('block.css'); $this->addCss('menu.css'); $this->addCss('fonts.css'); + $this->addCss('title.css'); + $this->addCss('typo.css'); $this->addCss('material-design-iconic-font.min.css'); $this->widget('System'); diff --git a/sources/app/widgets/AdHoc/_adhoc_form.tpl b/sources/app/widgets/AdHoc/_adhoc_form.tpl index 3573cff..6118a30 100644 --- a/sources/app/widgets/AdHoc/_adhoc_form.tpl +++ b/sources/app/widgets/AdHoc/_adhoc_form.tpl @@ -1,5 +1,5 @@
-
+ {$form}
diff --git a/sources/app/widgets/Chat/Chat.php b/sources/app/widgets/Chat/Chat.php index 3fb25d1..c083716 100644 --- a/sources/app/widgets/Chat/Chat.php +++ b/sources/app/widgets/Chat/Chat.php @@ -177,13 +177,12 @@ class Chat extends \Movim\Widget\Base if($jid == null) { RPC::call('movim_fill', 'chat_widget', $this->prepareEmpty()); } else { - $n = new Notification; - $n->ajaxCurrent('chat|'.$jid); - $n->ajaxClear('chat|'.$jid); - $chats = new Chats; $chats->ajaxGetHistory($jid); + $notif = new Notification; + $notif->ajaxClear('chat|'.$jid); + $html = $this->prepareChat($jid); RPC::call('movim_push_state', $this->route('chat', $jid)); diff --git a/sources/app/widgets/Chat/_chat.tpl b/sources/app/widgets/Chat/_chat.tpl index 01774ae..3f48c93 100644 --- a/sources/app/widgets/Chat/_chat.tpl +++ b/sources/app/widgets/Chat/_chat.tpl @@ -36,6 +36,14 @@ {else} -