mirror of
https://github.com/YunoHost-Apps/movim_ynh.git
synced 2024-09-03 19:46:19 +02:00
update to movim 20150820 to fix #5
This commit is contained in:
parent
c63a1cc949
commit
c437399993
5 changed files with 26 additions and 9 deletions
|
@ -5,10 +5,13 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
|
|||
|
||||
Warning: BETA.
|
||||
|
||||
Current Movim version : 20150818.
|
||||
Current Movim version : 20150820.
|
||||
|
||||
**Changelog**
|
||||
|
||||
0.7b 2015-08-20
|
||||
- Update to upstream Movim 20150820 to fix #5
|
||||
|
||||
0.6b 2015-08-19
|
||||
- Replace 'www-data' system user with 'movim'
|
||||
- Update to upstream Movim 20150818.
|
||||
|
|
|
@ -259,9 +259,9 @@ class Contact extends Model {
|
|||
}
|
||||
|
||||
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;
|
||||
else
|
||||
if($empty($this->date))
|
||||
$this->date = null;
|
||||
|
||||
$this->name = (string)$vcard->nickname->text;
|
||||
|
|
|
@ -20,6 +20,6 @@ subscriptions = Subscriptions
|
|||
servers = Groups servers
|
||||
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_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_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.
|
||||
|
|
|
@ -105,7 +105,7 @@ var Notification = {
|
|||
desktop : function(title, body, picture) {
|
||||
if(Notification.inhibed == true
|
||||
|| Notification.focused) return;
|
||||
|
||||
console.log(DesktopNotification);
|
||||
var notification = new DesktopNotification(title, { icon: picture, body: body });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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:hover:before {
|
||||
display: none;
|
||||
|
|
Loading…
Reference in a new issue