This commit is contained in:
Hannes Mannerheim 2014-12-02 23:46:12 +01:00
parent e48f6fbb47
commit ce738d6b09
2 changed files with 4 additions and 4 deletions

View File

@ -209,9 +209,8 @@ not only all notices of the Public Timeline but also those of all people on ot
<h3>Private Groups</h3>
<p>An admin of a group has the option to declare it private. This means:</p>
<p>1) new members must be approved by the admin(s), and</p>
<p>2) all notices are forced to be private. That is, notices in the group are only visible to group members (they don't appear in the Public Timeline), and it is not possible for users of other instances to be members of a private group on {instance-name}.</p>
<p class="indent">notices in the group are only visible to group members (they don't appear in the Public Timeline), and</p>
<p class="indent">it's not possible for users of other instances to be members of a private group on {instance-name}.</p>
<p>2) all notices are forced to be private.<br>
That is, notices in the group are only visible to group members (they don't appear in the Public Timeline), and it is not possible for users of other instances to be members of a private group on {instance-name}.</p>
<!-- 17 -->

View File

@ -398,7 +398,8 @@ $('#logout').click(function(){
$('#faq-link').click(function(){
popUpAction('popup-faq', window.siteTitle + ' ' + window.sL.FAQ,'<div id="faq-container"></div>',false);
$.get(window.fullUrlToThisQvitterApp + 'doc/faq.html', function(data){
var timeNow = new Date().getTime();
$.get(window.fullUrlToThisQvitterApp + 'doc/faq.html?t=' + timeNow, function(data){
if(data) {
var faqHtml = data;
faqHtml = faqHtml.replace(/{instance-name}/g,window.siteTitle);