diff --git a/README.md b/README.md index d48f89a..f860318 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ Warning: BETA. You need a valid SSL certificate to use Movim, auto-signed is not allowed. -Current Movim version : 0.9 git2015-09-03 +Current Movim version : 0.9 git2015-09-07 **Changelog** 0.9b 2015-0 -- Update to Movim 0.9 git2015-09-03 +- Update to Movim 0.9 git2015-09-07 - Add notes in README about public pods & whitelisting - script/install now check if path is empty. - script/remove now delete /etc/php/fpm/pool.d/movim.conf (fix #8). diff --git a/TODO b/TODO index e440893..767b061 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ - Check if Yes and yes are both working - Sysvinit script syslog - Log to /var/log/movim/ +- Movim must start AFTER mysql diff --git a/scripts/remove b/scripts/remove index 1316f16..f83ff09 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,7 +19,7 @@ sudo userdel movim sudo rm -rf /var/www/movim domain=$(sudo yunohost app setting movim domain) sudo rm -f /etc/nginx/conf.d/$domain.d/movim.conf -udo rm etc/php5/fpm/pool.d/movim.conf +sudo rm etc/php5/fpm/pool.d/movim.conf # Restarting services sudo service nginx reload diff --git a/sources/app/models/config/Config.php b/sources/app/models/config/Config.php index a6d647b..e4c514a 100644 --- a/sources/app/models/config/Config.php +++ b/sources/app/models/config/Config.php @@ -31,7 +31,7 @@ class Config extends Model { "loglevel" : {"type":"string", "size":16, "mandatory":true }, "timezone" : - {"type":"string", "size":16, "mandatory":true }, + {"type":"string", "size":32, "mandatory":true }, "xmppwhitelist" : {"type":"text" }, "info" : diff --git a/sources/app/views/page.tpl b/sources/app/views/page.tpl index 34e897c..f11aaac 100644 --- a/sources/app/views/page.tpl +++ b/sources/app/views/page.tpl @@ -11,8 +11,8 @@ - - + diff --git a/sources/app/widgets/Blog/blog.tpl b/sources/app/widgets/Blog/blog.tpl index 1f1c42f..0027338 100644 --- a/sources/app/widgets/Blog/blog.tpl +++ b/sources/app/widgets/Blog/blog.tpl @@ -103,7 +103,7 @@
{if="$value->getContact()->getTrueName() != ''"} @@ -47,7 +49,7 @@
{$value->content} diff --git a/sources/app/widgets/Groups/groups.js b/sources/app/widgets/Groups/groups.js index 1cda0c9..89011b3 100644 --- a/sources/app/widgets/Groups/groups.js +++ b/sources/app/widgets/Groups/groups.js @@ -10,7 +10,7 @@ var Groups = { Group_ajaxGetItems(this.dataset.server, this.dataset.node); Group_ajaxGetMetadata(this.dataset.server, this.dataset.node); Group_ajaxGetAffiliations(this.dataset.server, this.dataset.node); - //Group_ajaxGetSubscriptions(this.dataset.server, this.dataset.node); + Group_ajaxGetSubscriptions(this.dataset.server, this.dataset.node, false); Groups.reset(items); movim_add_class(this, 'active'); } diff --git a/sources/app/widgets/Login/login.js b/sources/app/widgets/Login/login.js index 73ccd14..c6c12fa 100644 --- a/sources/app/widgets/Login/login.js +++ b/sources/app/widgets/Login/login.js @@ -23,7 +23,7 @@ var Login = { Login.rememberSession(localStorage.username); // A fallback security - setTimeout("MovimWebsocket.unregister()", 7000); + setTimeout("MovimWebsocket.unregister()", 20000); } }, diff --git a/sources/app/widgets/Notifs/notifs.css b/sources/app/widgets/Notifs/notifs.css index 871047c..1da2e70 100644 --- a/sources/app/widgets/Notifs/notifs.css +++ b/sources/app/widgets/Notifs/notifs.css @@ -8,7 +8,7 @@ margin-right: 0.5em; border-radius: 1em; } - +/* #notifs_widget.groupshown li:not(:first-child){ display: none; } @@ -24,3 +24,4 @@ content: "\f2c0"; display: inline-block; } +*/ diff --git a/sources/app/widgets/Post/_post.tpl b/sources/app/widgets/Post/_post.tpl index 03e45f6..666d6ae 100644 --- a/sources/app/widgets/Post/_post.tpl +++ b/sources/app/widgets/Post/_post.tpl @@ -68,7 +68,7 @@