wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

Browse Source
This commit is contained in:
abjectio 2015-06-06 23:32:10 +02:00
commit 3bdcdfd114
13 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc-src/about
View File

@ -1,13 +1,13 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
%%site.name%% is a
social network based on the Free Software [GNU social](http://www.gnu.org/software/social/) tool.
social network based on the Free Software [GNU social](https://git.gnu.io/gnu/gnu-social) tool.
If you [register](%%action.register%%) for an account,
you can post small (%%site.textlimit%% chars or less) text notices
about yourself, where you are, what you're doing, or practically
anything you want. You can also subscribe to the notices of your
friends, or other people you're interested in, and follow them on the
Web or in an [RSS](http://en.wikipedia.org/wiki/RSS) feed.
Web or in an [RSS](https://en.wikipedia.org/wiki/RSS) feed.

2
doc-src/api
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
%%site.name%% provides an API that applications can use to interact with it.
More information about this API can be found on the [StatusNet Wiki](http://status.net/wiki/API).

4
doc-src/contact
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
There are a number of options for getting in contact with responsible
people for %%site.name%%.
@ -9,7 +9,7 @@ Bugs
----
If you think you've found a bug in the underlying [GNU social](https://gnu.io/social/) software,
or if there's a new feature you'd like to see, add it into the [GNU social task list](https://bugz.foocorp.net/).
or if there's a new feature you'd like to see, add it into the [GNU social task list](https://git.gnu.io/gnu/gnu-social/issues).
Don't forget to check the list of existing bugs to make sure it hasn't already been reported!
Email

2
doc-src/faq
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
These are some *Frequently Asked Questions* about this service, with
some answers.

2
doc-src/groups
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
Users on %%site.name%% can create *groups* that other users can join.
Groups can be a great way to share information and entertainment with

2
doc-src/help
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
%%site.name%% is a **social service**. Users can post short
(%%site.textlimit%% character) status messages which are broadcast to

14
doc-src/im
View File

@ -1,15 +1,14 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
You can post messages to %%site.name%% using a [Jabber](http://jabber.org/) client
on your computer, mobile phone, or other platform. ([GTalk](http://talk.google.com/),
Google's Jabber program, will also work.) This can be a convenient way to keep
up with your friends on %%site.name%%.
on your computer, mobile phone, or other platform. This can be a convenient way to
keep up with your friends on %%site.name%%.
If you don't already have a Jabber account, you can use GTalk or one of the other
If you don't already have a Jabber account, one of the
[public Jabber services](http://www.jabber.org/im-services). You'll probably also
need an IM client like [Pidgin](http://www.pidgin.im/).
need an IM client like [Pidgin](https://www.pidgin.im/).
Managing your IM settings
-------------------------
@ -17,8 +16,7 @@ Managing your IM settings
Use the [IM settings](%%action.imsettings%%) page to set your IM preferences. You can add or change your Jabber address and set the flags for Jabber update.
When you add or change your address, you'll receive a message from **%%xmpp.user%%@%%xmpp.server%%** asking you to confirm the change. (You may need to
add %%xmpp.user%%@%%xmpp.server%% to your buddy list *before* changing your IM
settings; this is definitely true for GTalk.)
add %%xmpp.user%%@%%xmpp.server%% to your buddy list *before* changing your IM settings.)
Sending updates
---------------

6
doc-src/privacy
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
This document outlines this service's respect for your personal
privacy as a user of the service.
@ -24,10 +24,10 @@ privacy as a user of the service.
users are registered with Hotmail addresses."
- Your notices (including files) can be downloaded and re-used by
other services, either one-by-one or in bulk as
[RSS](http://en.wikipedia.org/wiki/RSS) files.
[RSS](https://en.wikipedia.org/wiki/RSS) files.
- Your profile information (including subscriptions and avatars) can be
downloaded and re-used by other services, either scraped from the HTML
interface or in bulk as [FOAF](http://en.wikipedia.org/wiki/FOAF) files.
interface or in bulk as [FOAF](https://en.wikipedia.org/wiki/FOAF) files.
- Your notices will be forwarded to users who subscribe to them,
including users on another microblogging service.
- Your profile information will be sent to microblogging services for

2
doc-src/sms
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
You can post messages to %%site.name%% using many kinds of cell
phones that support SMS messaging. This site does not support SMS

12
doc-src/source
View File

@ -1,20 +1,20 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
This service uses a Free microblogging tool called **GNU social**.
GNU social is available under the [GNU Affero General Public License
Version 3.0](http://www.fsf.org/licensing/licenses/agpl-3.0.html), a
Version 3.0](https://www.fsf.org/licensing/licenses/agpl-3.0.html), a
Free Software license for network services.
You can get a copy of the software by following links from the
[GNU social main site](http://gnu.io/)¹. The version of the software
[GNU social main site](https://gnu.io/)¹. The version of the software
that runs on *this* site is unmodified from that version. The site
also depends on certain libraries and other software; these are all
bundled in the [GNU social repository](https://gitorious.org/social/mainline)²
bundled in the [GNU social repository](https://git.gnu.io/gnu/gnu-social)²
and release archive files.
References
----------
1. GNU social main site, <http://gnu.io>
2. GNU social repository, <https://gitorious.org/social/mainline>
1. GNU social main site, <https://gnu.io>
2. GNU social repository, <https://git.gnu.io/gnu/gnu-social>

4
doc-src/tags
View File

@ -1,9 +1,9 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
%%site.name%% supports
[tags](http://en.wikipedia.org/wiki/Tag_(metadata)) to help you
[tags](https://en.wikipedia.org/wiki/Tag_(metadata)) to help you
organize your activities here. You can use tags for people and for
notices.

10
doc-src/tos
View File

@ -1,6 +1,6 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
<!-- https://creativecommons.org/licenses/by/3.0/ for details. -->
The gist
--------
@ -24,7 +24,7 @@ Service, decided to make them available under a Creative Commons
Sharealike license, which means you’re more than welcome to steal it
and repurpose it for your own use. Just make sure to replace
references to us with ones to you. They’d appreciate a link to
[WordPress.com](http://www.wordpress.com/) somewhere on your site.
[WordPress.com](https://wordpress.com/) somewhere on your site.
They spent a lot of money and time on the below, and other people
shouldn’t need to do the same. (We didn't!))
@ -295,10 +295,10 @@ to the benefit of the parties, their successors and permitted
assigns.</li> </ol>
*Originally published by Automattic, Inc. as the [WordPress.com Terms
of Service](http://en.wordpress.com/tos/) and made available by them
of Service](https://en.wordpress.com/tos/) and made available by them
under the [Creative Commons Attribution-ShareAlike 3.0
License](http://creativecommons.org/licenses/by-sa/3.0/).
License](https://creativecommons.org/licenses/by-sa/3.0/).
Modifications to remove reference to "VIP services", rename "blog" to
"notice stream", remove the choice-of-venue clause, and add variables
specific to instances of this software made by Control Yourself, Inc.
and made available under the terms of the same license.*
and made available under the terms of the same license.*

11
lib/toselector.php
View File

@ -102,7 +102,16 @@ class ToSelector extends Widget
$choices[$value] = $groups->getBestName();
}
// XXX: add users...?
// Add subscribed users to dropdown menu
$users = $this->user->getSubscribed();
while ($users->fetch()) {
$value = 'profile:'.$users->id;
if ($this->user->streamNicknames()) {
$choices[$value] = $users->getNickname();
} else {
$choices[$value] = $users->getBestName();
}
}
if ($this->to instanceof Profile) {
$value = 'profile:'.$this->to->id;