YunoHost-Apps/movim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/movim_ynh.git synced 2024-09-03 19:46:19 +02:00
Code Issues Activity Actions

update to movim 20150820 to fix #5

Browse source
This commit is contained in:
src386 2015-08-20 11:15:14 +02:00
parent c63a1cc949
commit c437399993
5 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -5,10 +5,13 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
Warning: BETA. Warning: BETA.
Current Movim version : 20150818. Current Movim version : 20150820.
**Changelog** **Changelog**
0.7b 2015-08-20
- Update to upstream Movim 20150820 to fix #5
0.6b 2015-08-19 0.6b 2015-08-19
- Replace 'www-data' system user with 'movim' - Replace 'www-data' system user with 'movim'
- Update to upstream Movim 20150818. - Update to upstream Movim 20150818.

4
sources/app/models/contact/Contact.php
View file

@ -259,9 +259,9 @@ class Contact extends Model {
} }
public function setVcard4($vcard) { public function setVcard4($vcard) {
if(isset($vcard->bday->date) && !empty((string)$vcard->bday->date)) if(isset($vcard->bday->date))
$this->date = (string)$vcard->bday->date; $this->date = (string)$vcard->bday->date;
else if($empty($this->date))
$this->date = null; $this->date = null;
$this->name = (string)$vcard->nickname->text; $this->name = (string)$vcard->nickname->text;

2
sources/app/widgets/Group/locales.ini
View file

@ -20,6 +20,6 @@ subscriptions = Subscriptions
servers = Groups servers servers = Groups servers
search_server = Search for a new server search_server = Search for a new server
help_info1 = "Groups are the perfect way to share posts about topics that you like with all the other Movim's users." help_info1 = "Groups are the perfect way to share posts about topics that you like with all the other Movim's users."
help_info2 = Choose a server and a Group and subscribe to it using the %s button in the header. You can alse create a new one using the %s button. help_info2 = Choose a server and a Group and subscribe to it using the %s button in the header. You can also create a new one using the %s button.
help_info3 = Done? You can now publish a new post in the Group by using the %s button. help_info3 = Done? You can now publish a new post in the Group by using the %s button.
help_info4 = You will find a list of all your subscribed Groups in My Subscriptions and receive instantly all the new incoming posts in the %sNews%s page. help_info4 = You will find a list of all your subscribed Groups in My Subscriptions and receive instantly all the new incoming posts in the %sNews%s page.

2
sources/app/widgets/Notification/notification.js
View file

@ -105,7 +105,7 @@ var Notification = {
desktop : function(title, body, picture) { desktop : function(title, body, picture) {
if(Notification.inhibed == true if(Notification.inhibed == true
|| Notification.focused) return; || Notification.focused) return;
console.log(DesktopNotification);
var notification = new DesktopNotification(title, { icon: picture, body: body }); var notification = new DesktopNotification(title, { icon: picture, body: body });
} }
} }

14
sources/themes/material/css/style.css
View file

@ -200,6 +200,20 @@ body > nav li { /* Little hack for the navbar */
} }
} }
@media screen and (min-width: 1680px) {
body > nav,
body > nav:hover {
width: 32rem;
box-shadow: none;
}
body > nav + main,
body > nav:hover + main {
opacity: 1;
width: calc(100% - 32rem);
}
}
body > nav.active:before, body > nav.active:before,
body > nav:hover:before { body > nav:hover:before {
display: none; display: none;