]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
8 years agoFile_oembed varchar to text changes
Mikael Nordfeldth [Sun, 27 Dec 2015 11:11:29 +0000 (12:11 +0100)]
File_oembed varchar to text changes

No need to have text length limitations in the database for fields which
very well may be longer than what was previously set.

8 years agovarchar to text since there's no reason to limit the fields
Mikael Nordfeldth [Sun, 27 Dec 2015 10:50:11 +0000 (11:50 +0100)]
varchar to text since there's no reason to limit the fields

They caused problems when quitter.se was upgrading because someone was
named ryanjjjjjjjjjjjjjjjjjjj[and more than 191 'j's] etc.

8 years agoClarify that notices are also deleted with nukefile.php
Mikael Nordfeldth [Sun, 27 Dec 2015 10:43:25 +0000 (11:43 +0100)]
Clarify that notices are also deleted with nukefile.php

8 years agoReport if the email was not sent!
Mikael Nordfeldth [Sun, 27 Dec 2015 01:16:12 +0000 (02:16 +0100)]
Report if the email was not sent!

8 years agoServer exceptions should reasonably be 5xx
Mikael Nordfeldth [Sun, 27 Dec 2015 01:15:37 +0000 (02:15 +0100)]
Server exceptions should reasonably be 5xx

8 years agosyntax error
Mikael Nordfeldth [Sun, 27 Dec 2015 00:42:03 +0000 (01:42 +0100)]
syntax error

8 years agoDuplicate URI means we have it already, I assume
Mikael Nordfeldth [Sun, 27 Dec 2015 00:40:00 +0000 (01:40 +0100)]
Duplicate URI means we have it already, I assume

8 years agoHandle lack of parent nicely
Mikael Nordfeldth [Sat, 26 Dec 2015 15:36:03 +0000 (16:36 +0100)]
Handle lack of parent nicely

8 years agoLogging fixes
Mikael Nordfeldth [Sat, 26 Dec 2015 15:27:06 +0000 (16:27 +0100)]
Logging fixes

8 years agoMerge branch 'rm-design-config-doc' into 'nightly'
mmn [Wed, 23 Dec 2015 21:04:25 +0000 (21:04 +0000)]
Merge branch 'rm-design-config-doc' into 'nightly'

Remove $config['design'] documentation

I believe those options are gone since
36d619480a8f5fa06db5b54fe7686de83d8225be

Ref. #109

See merge request !70

8 years agoMerge branch 'autocomplete-group' into 'nightly'
mmn [Wed, 23 Dec 2015 21:04:18 +0000 (21:04 +0000)]
Merge branch 'autocomplete-group' into 'nightly'

Autocomplete group

Group autocompletion wasn't working for a couple of reasons:

1. $profile wasn't set (d8092207c0)
2. Profile::getUri() wasn't working for Groups, causing Profile::getAcctUri() to throw a ProfileNoAcctUriException (3e830dad374)

See merge request !68

8 years agoMerge branch 'profile-prefs-getall' into 'nightly'
mmn [Wed, 23 Dec 2015 21:03:55 +0000 (21:03 +0000)]
Merge branch 'profile-prefs-getall' into 'nightly'

Fixup Profile_prefs::getAll()

Ref. #98

See merge request !69

8 years agoRemove $config['design'] documentation
Chimo [Mon, 21 Dec 2015 17:53:30 +0000 (17:53 +0000)]
Remove $config['design'] documentation

I believe those options are gone since
36d619480a8f5fa06db5b54fe7686de83d8225be

8 years agoProfile_prefs::getAll fix prefs loop
Chimo [Thu, 17 Dec 2015 14:58:06 +0000 (14:58 +0000)]
Profile_prefs::getAll fix prefs loop

DataObject::fetch doesn't return an object.

8 years agoProfile_prefs::getAll fix call to listFind
Chimo [Thu, 17 Dec 2015 14:55:39 +0000 (14:55 +0000)]
Profile_prefs::getAll fix call to listFind

2nd argument needs to be an array

8 years agoMake Profile::getUri work with Groups
Chimo [Wed, 16 Dec 2015 02:49:42 +0000 (21:49 -0500)]
Make Profile::getUri work with Groups

and by extension Profile::getAcctUri

8 years agoAutocomplete: Fix $profile being null for groups
Chimo [Wed, 16 Dec 2015 02:48:18 +0000 (21:48 -0500)]
Autocomplete: Fix $profile being null for groups

8 years agoMerge branch 'mmn_fixes' into nightly
Mikael Nordfeldth [Tue, 15 Dec 2015 11:34:12 +0000 (12:34 +0100)]
Merge branch 'mmn_fixes' into nightly

8 years ago$url should've been $file->getUrl()
Mikael Nordfeldth [Tue, 15 Dec 2015 11:30:35 +0000 (12:30 +0100)]
$url should've been $file->getUrl()

8 years agoDon't check Link header if not set
Mikael Nordfeldth [Tue, 15 Dec 2015 10:51:16 +0000 (11:51 +0100)]
Don't check Link header if not set

8 years agoBetter checks for defined array indexes
Mikael Nordfeldth [Tue, 15 Dec 2015 10:50:57 +0000 (11:50 +0100)]
Better checks for defined array indexes

8 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 21:11:26 +0000 (22:11 +0100)]
Merge branch 'master' into nightly

8 years agoMerge branch 'send-twitter-replies-to-twitter' into 'master'
mmn [Mon, 14 Dec 2015 21:10:57 +0000 (21:10 +0000)]
Merge branch 'send-twitter-replies-to-twitter' into 'master'

Always send Twitter replies to Twitter

If is_twitter_notice($notice->reply_to) then send it to Twitter, even
if twitter import is off.  It's a reply to a Twitter notice, it should
go there!

(Also retweets.)

See merge request !42

8 years agoMerge branch 'direct-feed-sub' into 'master'
mmn [Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)]
Merge branch 'direct-feed-sub' into 'master'

If we are given a direct URL to a feed, use that

See merge request !54

8 years agoMerge branch 'twitter-show-rel-syndication' into 'master'
mmn [Mon, 14 Dec 2015 21:09:08 +0000 (21:09 +0000)]
Merge branch 'twitter-show-rel-syndication' into 'master'

Include rel-syndication link for tweets

As per: <http://microformats.org/wiki/rel-syndication>
This allows some services to find a post in Twitter.

See merge request !44

8 years agoMerge branch 'firefox-sub-link' into 'master'
mmn [Mon, 14 Dec 2015 21:08:22 +0000 (21:08 +0000)]
Merge branch 'firefox-sub-link' into 'master'

Link to add to Firefox as feedreader

This allows easily subscribing to any feed firefox detects in your GNU Social instance.

See merge request !55

8 years agoMerge branch 'fix-twitter-uri' into 'master'
mmn [Mon, 14 Dec 2015 21:07:48 +0000 (21:07 +0000)]
Merge branch 'fix-twitter-uri' into 'master'

Twitter URIs have changed

The #! was deprecated ages ago, and Twitter forces HTTPS these days.

See merge request !43

8 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 21:07:06 +0000 (22:07 +0100)]
Merge branch 'master' into nightly

8 years agoMerge branch 'inbound-linkback' into 'master'
mmn [Mon, 14 Dec 2015 21:05:25 +0000 (21:05 +0000)]
Merge branch 'inbound-linkback' into 'master'

Accept mentions/replies/rsvps/likes via pingback and webmention

This makes the Linkback plugin bidirectional, allowing reply/mention federation between GNU Social and any pingback-enabled service (including any Wordpress site).

See merge request !41

8 years agoMerge branch 'twitter-check-dupe-by-uri' into 'master'
mmn [Mon, 14 Dec 2015 21:04:22 +0000 (21:04 +0000)]
Merge branch 'twitter-check-dupe-by-uri' into 'master'

TwitterBridge also check for dupe by uri

In case a twitter item came in from some other source (such as linkback).

See merge request !45

8 years agoMerge branch 'repost-of-uf2' into 'master'
mmn [Mon, 14 Dec 2015 21:03:38 +0000 (21:03 +0000)]
Merge branch 'repost-of-uf2' into 'master'

Mark up link to original as a repost for repeats

http://indiewebcamp.com/repost

See merge request !46

8 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 21:03:04 +0000 (22:03 +0100)]
Merge branch 'master' into nightly

8 years agoMerge branch 'master' into mmn_fixes
Mikael Nordfeldth [Mon, 14 Dec 2015 21:01:50 +0000 (22:01 +0100)]
Merge branch 'master' into mmn_fixes

8 years agoMerge branch 'at-mention-url' into 'master'
mmn [Mon, 14 Dec 2015 21:01:42 +0000 (21:01 +0000)]
Merge branch 'at-mention-url' into 'master'

MentionURL Plugin

This plugin enables users to use the syntax `@twitter.com/singpolyma` to mention users the system does not know about, or to be more specific when a nickname is ambiguous.

See merge request !53

8 years agoMerge branch 'group-join-approve-reject-button-icons' into 'nightly'
mmn [Mon, 14 Dec 2015 20:48:36 +0000 (20:48 +0000)]
Merge branch 'group-join-approve-reject-button-icons' into 'nightly'

Add icons to group-join approval/rejection buttons

Relates to #106

See merge request !66

8 years agoMerge branch 'group-join-rejections' into 'nightly'
mmn [Mon, 14 Dec 2015 20:48:18 +0000 (20:48 +0000)]
Merge branch 'group-join-rejections' into 'nightly'

Fix group-join request rejections

Relates to #105

See merge request !65

8 years agoMerge branch 'group-members-pending' into 'nightly'
mmn [Mon, 14 Dec 2015 20:47:47 +0000 (20:47 +0000)]
Merge branch 'group-members-pending' into 'nightly'

Fix "pending members" group list

Related to #104

See merge request !64

8 years agoMerge branch 'api-docs' into 'nightly'
mmn [Mon, 14 Dec 2015 20:47:17 +0000 (20:47 +0000)]
Merge branch 'api-docs' into 'nightly'

Add AtomPub, Twitter-compat. API documentation to doc-src/

See merge request !62

8 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 20:45:46 +0000 (21:45 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

8 years agogetID() will complain loudly if something is wrong
Mikael Nordfeldth [Mon, 14 Dec 2015 20:44:59 +0000 (21:44 +0100)]
getID() will complain loudly if something is wrong

(just ->id would not)

8 years agoMerge commit '5c4a7a10' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 20:42:08 +0000 (21:42 +0100)]
Merge commit '5c4a7a10' into nightly

hannes making sure notice is a repeat and not a delete activity notice

8 years agoMerge branch 'php-minversion-detec' into 'nightly'
mmn [Mon, 14 Dec 2015 20:37:53 +0000 (20:37 +0000)]
Merge branch 'php-minversion-detec' into 'nightly'

installer::checkPrereqs bump PHP version to 5.5.0

Related to #102

See merge request !63

8 years agoMerge branch 'fix-setpassword' into 'nightly'
mmn [Mon, 14 Dec 2015 20:37:26 +0000 (20:37 +0000)]
Merge branch 'fix-setpassword' into 'nightly'

Fix /scripts/setpassword.php

common_munge_password is expecting a Profile, we were passing a user_id.

Thanks @aroque for the fix ( ref. #100 )

See merge request !67

8 years agoWe have to print/echo when outputting json (thanks hannes)
Mikael Nordfeldth [Mon, 14 Dec 2015 20:29:39 +0000 (21:29 +0100)]
We have to print/echo when outputting json (thanks hannes)

8 years agoWe have to print/echo when outputting json (thanks hannes)
Mikael Nordfeldth [Mon, 14 Dec 2015 20:29:39 +0000 (21:29 +0100)]
We have to print/echo when outputting json (thanks hannes)

8 years agoredir_info only has data if we ran discovery
Mikael Nordfeldth [Tue, 8 Dec 2015 10:42:09 +0000 (11:42 +0100)]
redir_info only has data if we ran discovery

8 years agoFull identifiers for Autocomplete, less confusing
Mikael Nordfeldth [Sat, 5 Dec 2015 15:18:59 +0000 (16:18 +0100)]
Full identifiers for Autocomplete, less confusing

8 years agoRemember to purify HTML...
Mikael Nordfeldth [Sat, 5 Dec 2015 14:56:50 +0000 (15:56 +0100)]
Remember to purify HTML...

8 years agoircs URLs work fine in Firefox at least
Mikael Nordfeldth [Sat, 5 Dec 2015 12:02:49 +0000 (13:02 +0100)]
ircs URLs work fine in Firefox at least

8 years agoFix /scripts/setpassword.php
Chimo [Fri, 4 Dec 2015 17:09:06 +0000 (17:09 +0000)]
Fix /scripts/setpassword.php

common_munge_password is expecting a Profile, we were passing a user_id.

Thanks @aroque for the fix ( ref. #100 )

8 years agoAdd icons to group-join approval/rejection buttons
Chimo [Fri, 4 Dec 2015 17:00:35 +0000 (17:00 +0000)]
Add icons to group-join approval/rejection buttons

8 years agoFix group-join request rejections
Chimo [Fri, 4 Dec 2015 16:09:51 +0000 (16:09 +0000)]
Fix group-join request rejections

8 years agoFix "pending members" group list
Chimo [Fri, 4 Dec 2015 15:47:40 +0000 (15:47 +0000)]
Fix "pending members" group list

8 years agoinstaller::checkPrereqs bump PHP version to 5.5.0
Chimo [Fri, 4 Dec 2015 15:22:58 +0000 (15:22 +0000)]
installer::checkPrereqs bump PHP version to 5.5.0

8 years agoVarious minor theme enhancements in neo-gnu
Mikael Nordfeldth [Mon, 30 Nov 2015 01:31:51 +0000 (02:31 +0100)]
Various minor theme enhancements in neo-gnu

8 years agoList groups with nickname instead of full name in sidebar
Mikael Nordfeldth [Mon, 30 Nov 2015 01:21:17 +0000 (02:21 +0100)]
List groups with nickname instead of full name in sidebar

8 years agoOembed slimmed to only do discovery (soon we get og: discovery too)
Mikael Nordfeldth [Mon, 30 Nov 2015 01:06:04 +0000 (02:06 +0100)]
Oembed slimmed to only do discovery (soon we get og: discovery too)

8 years agoquickGetJson for HTTP requests to return json objects
Mikael Nordfeldth [Mon, 30 Nov 2015 01:05:06 +0000 (02:05 +0100)]
quickGetJson for HTTP requests to return json objects

8 years agoHTTPClient get $params array and oEmbedHelper uses it
Mikael Nordfeldth [Mon, 30 Nov 2015 00:28:18 +0000 (01:28 +0100)]
HTTPClient get $params array and oEmbedHelper uses it

9 years agoAdd AtomPub, Twitter-compat. API documentation to doc-src/
Chimo [Tue, 24 Nov 2015 17:59:43 +0000 (12:59 -0500)]
Add AtomPub, Twitter-compat. API documentation to doc-src/

9 years agoEvents listing, but the stream will change soon
Mikael Nordfeldth [Mon, 23 Nov 2015 13:40:59 +0000 (14:40 +0100)]
Events listing, but the stream will change soon

9 years agobump beta version number
Mikael Nordfeldth [Sun, 22 Nov 2015 23:42:13 +0000 (00:42 +0100)]
bump beta version number

9 years agoallow form ->li() to set $class
Mikael Nordfeldth [Sun, 22 Nov 2015 23:40:28 +0000 (00:40 +0100)]
allow form ->li() to set $class

9 years agoManaged_DataObject::newUri was called improperly
Mikael Nordfeldth [Sun, 22 Nov 2015 23:39:49 +0000 (00:39 +0100)]
Managed_DataObject::newUri was called improperly

9 years agomake sure returned notice is a repeat, i.e. not a delete activity notice
hannes [Sun, 22 Nov 2015 20:28:07 +0000 (20:28 +0000)]
make sure returned notice is a repeat, i.e. not a delete activity notice

9 years agoActivityVerb::SHARE instead of http://activitystrea.ms/schema/1.0/share
hannes [Sun, 22 Nov 2015 20:26:08 +0000 (20:26 +0000)]
ActivityVerb::SHARE instead of http://activitystrea.ms/schema/1.0/share

9 years agomake sure the notice is a repeat, i.e. not a delete activity notice that also can...
hannes [Sun, 22 Nov 2015 18:59:56 +0000 (18:59 +0000)]
make sure the notice is a repeat, i.e. not a delete activity notice that also can have a repeat_of set

9 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
Mikael Nordfeldth [Fri, 20 Nov 2015 17:50:26 +0000 (18:50 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

9 years agoMerge branch 'refactor-file-processNew' into 'nightly'
mmn [Fri, 20 Nov 2015 17:50:01 +0000 (17:50 +0000)]
Merge branch 'refactor-file-processNew' into 'nightly'

Refactor on File::processNew

The code was so involved there was even a comment asking for a refactor.

Now, File_redirection::where always returns a nice File_redirection
object instead of an array or string or nothing.  The object is
either one which already existed or else a new, unsaved object.

Instead of duplicating "does it exist" checks everywhere, do it in
File_redirection::where.  You either get what exists or something to save.

An unsaved File_redirection may be paired with an unsaved File.
You will want to save the File first (using ->saveFile()) and put the
id in File_redirection#file_id before saving.

See merge request !57

9 years agoMerge request #59 which was directed at master
Mikael Nordfeldth [Fri, 20 Nov 2015 17:47:21 +0000 (18:47 +0100)]
Merge request #59 which was directed at master

9 years agoMerge branch 'master' into 'master'
mmn [Fri, 20 Nov 2015 17:46:53 +0000 (17:46 +0000)]
Merge branch 'master' into 'master'

block check can't be done inside the same try-expression as Subscription::getSub…

…scription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.

See merge request !59

9 years agoblock check can't be done inside the same try-expression as Subscription::getSubscrip...
hannes [Thu, 19 Nov 2015 15:55:11 +0000 (15:55 +0000)]
block check can't be done inside the same try-expression as Subscription::getSubscription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.

9 years agoShow better source for linback items
Stephen Paul Weber [Tue, 27 Oct 2015 17:13:11 +0000 (17:13 +0000)]
Show better source for linback items

9 years agoUpdate conversation when we update reply_to
Stephen Paul Weber [Tue, 27 Oct 2015 03:15:38 +0000 (03:15 +0000)]
Update conversation when we update reply_to

Or repeat_of

9 years agoAutodiscovery header for webmention
Stephen Paul Weber [Sun, 25 Oct 2015 18:42:14 +0000 (18:42 +0000)]
Autodiscovery header for webmention

9 years agoIgnore self pings
Stephen Paul Weber [Sun, 25 Oct 2015 17:30:51 +0000 (17:30 +0000)]
Ignore self pings

9 years agoThat never was meant to be in that if
Stephen Paul Weber [Sun, 25 Oct 2015 16:50:59 +0000 (16:50 +0000)]
That never was meant to be in that if

9 years agoUse author-declared URL as URI
Stephen Paul Weber [Fri, 23 Oct 2015 18:41:00 +0000 (18:41 +0000)]
Use author-declared URL as URI

Will make brid.gy work better, for example.

9 years agoAdd pingback frontend
Stephen Paul Weber [Thu, 22 Oct 2015 20:15:44 +0000 (20:15 +0000)]
Add pingback frontend

9 years agoSearch in sub-items for links to the target as well
Stephen Paul Weber [Thu, 22 Oct 2015 19:29:04 +0000 (19:29 +0000)]
Search in sub-items for links to the target as well

9 years agoCatch exception that this generates when there is no result
Stephen Paul Weber [Thu, 22 Oct 2015 19:13:56 +0000 (19:13 +0000)]
Catch exception that this generates when there is no result

9 years agoFix duplicate detection
Stephen Paul Weber [Thu, 22 Oct 2015 19:13:16 +0000 (19:13 +0000)]
Fix duplicate detection

9 years agoUpdate on duplicate linkback
Stephen Paul Weber [Thu, 22 Oct 2015 18:21:46 +0000 (18:21 +0000)]
Update on duplicate linkback

This especially allows mentioning mulitple users, etc.

9 years agoLinkback to user should work
Stephen Paul Weber [Thu, 22 Oct 2015 17:39:15 +0000 (17:39 +0000)]
Linkback to user should work

9 years agoIgnore non-local notices as targets
Stephen Paul Weber [Thu, 22 Oct 2015 17:20:03 +0000 (17:20 +0000)]
Ignore non-local notices as targets

9 years agoWebmention frontend
Stephen Paul Weber [Thu, 22 Oct 2015 17:18:20 +0000 (17:18 +0000)]
Webmention frontend

9 years agoInitial helpers for verification and microformats
Stephen Paul Weber [Thu, 22 Oct 2015 17:17:14 +0000 (17:17 +0000)]
Initial helpers for verification and microformats

This will form the backend of all incoming linkbacks.
We verify the linkback is real and then try to form a rich notice
out of it.

9 years agoMake it clearer that we're handling group IDs
Mikael Nordfeldth [Sun, 8 Nov 2015 22:31:45 +0000 (23:31 +0100)]
Make it clearer that we're handling group IDs

9 years agoFix federation issue with groups (bad list order)
Mikael Nordfeldth [Sun, 8 Nov 2015 22:31:23 +0000 (23:31 +0100)]
Fix federation issue with groups (bad list order)

9 years agoOoops, copypasted something into the wrong place.
Mikael Nordfeldth [Sun, 8 Nov 2015 22:24:20 +0000 (23:24 +0100)]
Ooops, copypasted something into the wrong place.

9 years agoOStatus usage of static Validate::* calls fixed
Mikael Nordfeldth [Sun, 8 Nov 2015 09:33:41 +0000 (10:33 +0100)]
OStatus usage of static Validate::* calls fixed

9 years agoMerge branch 'master' of git.gnu.io:gnu/gnu-social into nightly
Mikael Nordfeldth [Fri, 6 Nov 2015 12:39:17 +0000 (13:39 +0100)]
Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

9 years agoMerge branch 'in-reply-to-uf2' into 'master'
mmn [Fri, 6 Nov 2015 12:39:02 +0000 (12:39 +0000)]
Merge branch 'in-reply-to-uf2' into 'master'

Add direct link to parent notice

This is partly for usability, and partly to make Linkbacks for replies work (when the plugin is enabled).

See merge request !37

9 years agoseparate classes into files in DirectMessage plugin
Mikael Nordfeldth [Fri, 6 Nov 2015 12:35:45 +0000 (13:35 +0100)]
separate classes into files in DirectMessage plugin

9 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
Mikael Nordfeldth [Fri, 6 Nov 2015 12:33:24 +0000 (13:33 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

9 years agoMerge branch 'nightly' into 'nightly'
mmn [Fri, 6 Nov 2015 12:28:00 +0000 (12:28 +0000)]
Merge branch 'nightly' into 'nightly'

getParent() method will fail if the parent notice does not exist in the notice table

getParent() method will fail if the parent notice does not exist in the notice table. See https://quitter.no/notice/709400

There are situations where a user delete his notice which could be a parent notice to a reply.
The user which replied to this deleted notice will then have broken timeline.
This is caused by the Notice.getParent() method which tries to return the selection of non existing parent notice.

I've tried this code on quitter.no and it seems to work.

See merge request !35

9 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
abjectio [Thu, 5 Nov 2015 16:34:34 +0000 (17:34 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

9 years agoMerge branch 'master' of git.gnu.io:gnu/gnu-social into nightly
Mikael Nordfeldth [Thu, 5 Nov 2015 15:16:02 +0000 (16:16 +0100)]
Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

Conflicts:
plugins/OStatus/OStatusPlugin.php

master vs. nightly thing

9 years agoMerge branch 'renew-pshb' into 'master'
mmn [Thu, 5 Nov 2015 15:13:16 +0000 (15:13 +0000)]
Merge branch 'renew-pshb' into 'master'

Actually use the renew code

We have the code to check once a day and renew, but currently it's
just in a script directory.  This change adds an event listener
hook to check and renew subscriptions daily.

Closes #83

See merge request !38

9 years agoMerge branch 'object-types-are-absolute' into 'master'
mmn [Thu, 5 Nov 2015 15:12:41 +0000 (15:12 +0000)]
Merge branch 'object-types-are-absolute' into 'master'

Stop incorrecly changing object_type to relative URI

All other data is using absolute URI for object_type.

See merge request !40