]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
8 years agoMerge remote-tracking branch 'upstream/master' into social-master
Roland Haeder [Sat, 30 Jan 2016 12:38:52 +0000 (13:38 +0100)]
Merge remote-tracking branch 'upstream/master' into social-master

8 years agoMerged stuff from upstream/master
Roland Haeder [Sat, 30 Jan 2016 12:38:25 +0000 (13:38 +0100)]
Merged stuff from upstream/master

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge branch 'master' of git.gnu.io:gnu/gnu-social
Mikael Nordfeldth [Fri, 29 Jan 2016 23:02:56 +0000 (00:02 +0100)]
Merge branch 'master' of git.gnu.io:gnu/gnu-social

8 years agoDon't trust local HTML either
Mikael Nordfeldth [Fri, 29 Jan 2016 23:00:37 +0000 (00:00 +0100)]
Don't trust local HTML either

If we reallyreally want to include <img> or <script> or whatever then we
have to do that after Notice::saveActivity sets ->rendered.

8 years agoMerge branch 'upstream-changes/google-analytics-removal' into 'master'
mmn [Thu, 28 Jan 2016 12:55:10 +0000 (12:55 +0000)]
Merge branch 'upstream-changes/google-analytics-removal' into 'master'

Removed plugin Google-Analytics

... as this is free/libre and decentralized software and should not promote centralized proprietary software. Please see the included Piwik plugin for a more decentralized alternative!

See merge request !94

8 years agoCannot use NoticeListemItem as type-hint as NoticeListItemAdapter exists.
Roland Haeder [Mon, 25 Jan 2016 17:02:01 +0000 (18:02 +0100)]
Cannot use NoticeListemItem as type-hint as NoticeListItemAdapter exists.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoStartMakeEntryForm must allow NULL for $form parameter
Roland Haeder [Mon, 25 Jan 2016 16:06:04 +0000 (17:06 +0100)]
StartMakeEntryForm must allow NULL for $form parameter

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoOpps, don't miss this here ...
Roland Haeder [Mon, 25 Jan 2016 16:01:18 +0000 (17:01 +0100)]
Opps, don't miss this here ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for entryForm() method + renamed $action back to $out from
Roland Haeder [Mon, 25 Jan 2016 15:42:28 +0000 (16:42 +0100)]
Added type-hint for entryForm() method + renamed $action back to $out from
previous commit.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for StartMakeEntryForm and renamed $out to $action
Roland Haeder [Mon, 25 Jan 2016 15:37:38 +0000 (16:37 +0100)]
Added type-hint for StartMakeEntryForm and renamed $out to $action

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for StartShowEntryForms hook
Roland Haeder [Mon, 25 Jan 2016 15:35:57 +0000 (16:35 +0100)]
Added type-hint for StartShowEntryForms hook

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for adaptNoticeListItem() method
Roland Haeder [Mon, 25 Jan 2016 15:33:36 +0000 (16:33 +0100)]
Added type-hint for adaptNoticeListItem() method

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for constructor of NoticeTreeItem class
Roland Haeder [Mon, 25 Jan 2016 15:31:46 +0000 (16:31 +0100)]
Added type-hint for constructor of NoticeTreeItem class

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for StartShowNoticeFormData hook
Roland Haeder [Mon, 25 Jan 2016 14:50:45 +0000 (15:50 +0100)]
Added type-hint for StartShowNoticeFormData hook

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoLast type-hint is an array, added.
Roland Haeder [Mon, 25 Jan 2016 14:50:05 +0000 (15:50 +0100)]
Last type-hint is an array, added.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded missing type-hints for EndRssEntryArray hooks.
Roland Haeder [Mon, 25 Jan 2016 14:48:20 +0000 (15:48 +0100)]
Added missing type-hints for EndRssEntryArray hooks.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded missing type-hints for EndNoticeSave(Web) (different).
Roland Haeder [Mon, 25 Jan 2016 14:47:25 +0000 (15:47 +0100)]
Added missing type-hints for EndNoticeSave(Web) (different).

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for EndShowNoticeOptionItems hooks.
Roland Haeder [Mon, 25 Jan 2016 14:45:49 +0000 (15:45 +0100)]
Added type-hint for EndShowNoticeOptionItems hooks.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for EndNoticeInScope hook.
Roland Haeder [Mon, 25 Jan 2016 14:44:50 +0000 (15:44 +0100)]
Added type-hint for EndNoticeInScope hook.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded missing type-hint for EndPublicGroupNav (it is Menu).
Roland Haeder [Mon, 25 Jan 2016 14:44:03 +0000 (15:44 +0100)]
Added missing type-hint for EndPublicGroupNav (it is Menu).

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for StartHostMetaLinks hook
Roland Haeder [Mon, 25 Jan 2016 14:41:43 +0000 (15:41 +0100)]
Added type-hint for StartHostMetaLinks hook

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded missing type-hint for StartShowHTML hook
Roland Haeder [Mon, 25 Jan 2016 14:41:05 +0000 (15:41 +0100)]
Added missing type-hint for StartShowHTML hook

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for StartNoticeSourceLink hooks.
Roland Haeder [Mon, 25 Jan 2016 14:40:13 +0000 (15:40 +0100)]
Added type-hint for StartNoticeSourceLink hooks.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hints for StartInitializeRouter hooks.
Roland Haeder [Mon, 25 Jan 2016 14:39:16 +0000 (15:39 +0100)]
Added type-hints for StartInitializeRouter hooks.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hints for EndLoginGroupNav and EndShowPageNotice hooks.
Roland Haeder [Mon, 25 Jan 2016 14:38:16 +0000 (15:38 +0100)]
Added type-hints for EndLoginGroupNav and EndShowPageNotice hooks.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hint for RedirectToLogin hooks. Please note that User $user=null
Roland Haeder [Mon, 25 Jan 2016 14:35:57 +0000 (15:35 +0100)]
Added type-hint for RedirectToLogin hooks. Please note that User $user=null
must beused as one call sets null for $user parameter.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded missing type-hints for EndAccountSettingsNav hooks
Roland Haeder [Mon, 25 Jan 2016 14:34:46 +0000 (15:34 +0100)]
Added missing type-hints for EndAccountSettingsNav hooks

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hints for EndNoticeWhoGets hooks
Roland Haeder [Mon, 25 Jan 2016 14:33:06 +0000 (15:33 +0100)]
Added type-hints for EndNoticeWhoGets hooks

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoAdded type-hints for StartAddNoticeReply hooks
Roland Haeder [Mon, 25 Jan 2016 14:32:07 +0000 (15:32 +0100)]
Added type-hints for StartAddNoticeReply hooks

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge branch 'upstream-changes/google-analytics-removal' into social-master
Roland Haeder [Mon, 25 Jan 2016 12:32:14 +0000 (13:32 +0100)]
Merge branch 'upstream-changes/google-analytics-removal' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoRemoved plugin Google-Analytics as this is free/libre and decentralized upstream-changes/google-analytics-removal
Roland Haeder [Mon, 25 Jan 2016 12:19:43 +0000 (13:19 +0100)]
Removed plugin Google-Analytics as this is free/libre and decentralized
software and should not promote centralized proprietary software. Please see
the included Piwik plugin for a more decentralized alternative!

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoIntroduced common_location_shared() to check if location sharing is always, features-enhancing-privacy/geometa-js-disabled
Roland Haeder [Sun, 24 Jan 2016 15:10:23 +0000 (16:10 +0100)]
Introduced common_location_shared() to check if location sharing is always,
never or by-user enabled. This commit also excluded geometa.js if location
sharing is for any reason disabled as this loads an external reference from
Google.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge remote-tracking branch 'upstream/master' into social-master
Roland Haeder [Fri, 22 Jan 2016 16:28:07 +0000 (17:28 +0100)]
Merge remote-tracking branch 'upstream/master' into social-master

8 years agoDid the OpportunisticQM fixes in the wrong order upstream-master
Mikael Nordfeldth [Mon, 11 Jan 2016 12:35:29 +0000 (13:35 +0100)]
Did the OpportunisticQM fixes in the wrong order

8 years agouse connect_timeout value for execution margin
Mikael Nordfeldth [Fri, 22 Jan 2016 11:19:17 +0000 (12:19 +0100)]
use connect_timeout value for execution margin

8 years agodefault connect_timeout to 5 instead of extlib 10
Mikael Nordfeldth [Mon, 18 Jan 2016 21:01:45 +0000 (22:01 +0100)]
default connect_timeout to 5 instead of extlib 10

8 years agoHandle exceptions when salmon slapping
Mikael Nordfeldth [Wed, 20 Jan 2016 13:55:41 +0000 (14:55 +0100)]
Handle exceptions when salmon slapping

Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called.

8 years agoIn very specific circumstances we can bulkDistribute 0 notices
Mikael Nordfeldth [Sat, 16 Jan 2016 16:18:14 +0000 (17:18 +0100)]
In very specific circumstances we can bulkDistribute 0 notices

Seems to be what caused an infinite loop on quitter.es, or I guess so anyway.

8 years agobulkDistribute won't add empty lists to database
Mikael Nordfeldth [Sat, 16 Jan 2016 16:34:27 +0000 (17:34 +0100)]
bulkDistribute won't add empty lists to database

8 years agoInitial user doesn't need as strict checking on email
Mikael Nordfeldth [Sat, 16 Jan 2016 16:20:26 +0000 (17:20 +0100)]
Initial user doesn't need as strict checking on email

8 years agoMerge branch 'master' of git.gnu.io:gnu/gnu-social
Mikael Nordfeldth [Sat, 16 Jan 2016 23:40:14 +0000 (00:40 +0100)]
Merge branch 'master' of git.gnu.io:gnu/gnu-social

8 years agoInitial user doesn't need as strict checking on email
Mikael Nordfeldth [Sat, 16 Jan 2016 16:20:26 +0000 (17:20 +0100)]
Initial user doesn't need as strict checking on email

8 years agoMerge branch 'fix_readme' into 'master'
mmn [Thu, 14 Jan 2016 12:03:11 +0000 (12:03 +0000)]
Merge branch 'fix_readme' into 'master'

update readme for OpportunisticQM: array need to contain key/value pairs

according to the doc-block of addPlugin() the array should contain key/value pairs, see https://git.gnu.io/gnu/gnu-social/blob/master/lib/gnusocial.php#L46

I updated the readme for the OpportunisticQM plugin to reflect this.

See merge request !81

8 years agoarray need to contain key/value pairs
Björn Schießle [Thu, 14 Jan 2016 11:39:39 +0000 (12:39 +0100)]
array need to contain key/value pairs

8 years agoSave some else blocks that makes the code just more complex.
Roland Haeder [Wed, 13 Jan 2016 16:28:28 +0000 (17:28 +0100)]
Save some else blocks that makes the code just more complex.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoType-hint is array here.
Roland Haeder [Wed, 13 Jan 2016 16:11:58 +0000 (17:11 +0100)]
Type-hint is array here.

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoMerge remote-tracking branch 'upstream/master' into social-master
Roland Haeder [Mon, 11 Jan 2016 21:45:53 +0000 (22:45 +0100)]
Merge remote-tracking branch 'upstream/master' into social-master

Maintained a type-hint

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoNot only local groups should be added to group inbox notificiation table
Mikael Nordfeldth [Sat, 9 Jan 2016 14:14:38 +0000 (15:14 +0100)]
Not only local groups should be added to group inbox notificiation table

8 years agoGet group attentions too for outbound notices
Mikael Nordfeldth [Sat, 9 Jan 2016 14:06:44 +0000 (15:06 +0100)]
Get group attentions too for outbound notices

8 years agoDo proper fromUri lookup on groups too
Mikael Nordfeldth [Sat, 9 Jan 2016 13:36:47 +0000 (14:36 +0100)]
Do proper fromUri lookup on groups too

8 years agoCancelGroupForm gets same typing as Join and Leave
Mikael Nordfeldth [Sat, 9 Jan 2016 13:13:19 +0000 (14:13 +0100)]
CancelGroupForm gets same typing as Join and Leave

8 years agoIssue #121 - use correct Group ID and strict User_group typing
Mikael Nordfeldth [Sat, 9 Jan 2016 13:06:31 +0000 (14:06 +0100)]
Issue #121 - use correct Group ID and strict User_group typing

8 years agoLocal user profile getUrl gives dynamically generated URL
Mikael Nordfeldth [Sat, 9 Jan 2016 12:47:38 +0000 (13:47 +0100)]
Local user profile getUrl gives dynamically generated URL

8 years agoActually return the group home URL
Mikael Nordfeldth [Sat, 9 Jan 2016 12:33:30 +0000 (13:33 +0100)]
Actually return the group home URL

8 years agoWups, $poster could be undefined
Mikael Nordfeldth [Sat, 9 Jan 2016 12:15:09 +0000 (13:15 +0100)]
Wups, $poster could be undefined

8 years agoAttention goes to the parent notice author too
Mikael Nordfeldth [Fri, 8 Jan 2016 01:58:31 +0000 (02:58 +0100)]
Attention goes to the parent notice author too

8 years agoSave attentions to Reply table for backwards compatibility
Mikael Nordfeldth [Fri, 8 Jan 2016 00:59:16 +0000 (01:59 +0100)]
Save attentions to Reply table for backwards compatibility

local users only of course

8 years agoAdd more info in logging call
Mikael Nordfeldth [Fri, 8 Jan 2016 00:52:10 +0000 (01:52 +0100)]
Add more info in logging call

There shouldn't be *HandleSalmonTarget, only verification of actor and
then Notice::saveActivity()!

8 years agoOStatus queue handler uses Notice->getAttentionProfiles()
Mikael Nordfeldth [Fri, 8 Jan 2016 00:31:47 +0000 (01:31 +0100)]
OStatus queue handler uses Notice->getAttentionProfiles()

and lots more debugging for LOG_DEBUG

8 years agoDefault to not include delete verbs in notice streams
Mikael Nordfeldth [Thu, 7 Jan 2016 22:33:47 +0000 (23:33 +0100)]
Default to not include delete verbs in notice streams

8 years agoNotice from web now saves context->attention too! ;)
Mikael Nordfeldth [Thu, 7 Jan 2016 22:24:15 +0000 (23:24 +0100)]
Notice from web now saves context->attention too! ;)

8 years agosaveAttentions, trying to move away from saveReply
Mikael Nordfeldth [Thu, 7 Jan 2016 22:23:51 +0000 (23:23 +0100)]
saveAttentions, trying to move away from saveReply

8 years agocommon_find_attentions to populate activities from content text
Mikael Nordfeldth [Thu, 7 Jan 2016 22:23:37 +0000 (23:23 +0100)]
common_find_attentions to populate activities from content text

8 years agoDon't store the notice object for distrib queue handler, just id
Mikael Nordfeldth [Thu, 7 Jan 2016 19:24:59 +0000 (20:24 +0100)]
Don't store the notice object for distrib queue handler, just id

8 years agoBeforePluginCheckSchema event for checkschema.php
Mikael Nordfeldth [Thu, 7 Jan 2016 17:45:36 +0000 (18:45 +0100)]
BeforePluginCheckSchema event for checkschema.php

8 years agoshortenLinks _after_ media upload to be consistent with api
Mikael Nordfeldth [Thu, 7 Jan 2016 17:14:45 +0000 (18:14 +0100)]
shortenLinks _after_ media upload to be consistent with api

8 years agoUse index for File url (urlhash)
Mikael Nordfeldth [Thu, 7 Jan 2016 17:13:10 +0000 (18:13 +0100)]
Use index for File url (urlhash)

8 years agoshortenLinks with a capital L
Mikael Nordfeldth [Thu, 7 Jan 2016 17:12:29 +0000 (18:12 +0100)]
shortenLinks with a capital L

8 years ago think I have managed to show oEmbed images better now
Mikael Nordfeldth [Thu, 7 Jan 2016 16:35:37 +0000 (17:35 +0100)]
 think I have managed to show oEmbed images better now

8 years agoFixed group representation in Directory plugin, also some ->raw calls
Mikael Nordfeldth [Thu, 7 Jan 2016 11:58:14 +0000 (12:58 +0100)]
Fixed group representation in Directory plugin, also some ->raw calls

8 years agoReturn Profile objects from getGroups in GroupdirectoryAction
Mikael Nordfeldth [Thu, 7 Jan 2016 11:35:52 +0000 (12:35 +0100)]
Return Profile objects from getGroups in GroupdirectoryAction

8 years agoAppropriate exception message in GroupNoProfileException
Mikael Nordfeldth [Thu, 7 Jan 2016 11:14:48 +0000 (12:14 +0100)]
Appropriate exception message in GroupNoProfileException

8 years agoDefine User_group::$profile_id among class variables
Mikael Nordfeldth [Thu, 7 Jan 2016 11:12:27 +0000 (12:12 +0100)]
Define User_group::$profile_id among class variables

8 years agoMax execution time margin for OpportunisticQM
Mikael Nordfeldth [Thu, 7 Jan 2016 10:58:09 +0000 (11:58 +0100)]
Max execution time margin for OpportunisticQM

I guess it could continue a bit too long in case it got a really long
(failing, timeouting) HTTP request just before max_execution_time hit.

8 years agoIndex the verb column since we do COUNT(*) based on it
Mikael Nordfeldth [Thu, 7 Jan 2016 10:39:46 +0000 (11:39 +0100)]
Index the verb column since we do COUNT(*) based on it

8 years agoConversation entries where id==0 would screw up the "re-auto-increment" sequencing
Mikael Nordfeldth [Wed, 6 Jan 2016 21:26:17 +0000 (22:26 +0100)]
Conversation entries where id==0 would screw up the "re-auto-increment" sequencing

8 years agoGah and a 302 in the non-exception-handling redirect too
Mikael Nordfeldth [Wed, 6 Jan 2016 19:09:59 +0000 (20:09 +0100)]
Gah and a 302 in the non-exception-handling redirect too

8 years agoAttachment thumbnail redirect is a 302 redirect
Mikael Nordfeldth [Wed, 6 Jan 2016 19:07:40 +0000 (20:07 +0100)]
Attachment thumbnail redirect is a 302 redirect

It SHOULD be cached but it might no longer be valid if we empty cache or something.

8 years agoOur URLs are permanent redirects, mind you!
Mikael Nordfeldth [Wed, 6 Jan 2016 19:06:14 +0000 (20:06 +0100)]
Our URLs are permanent redirects, mind you!

8 years agoBreaking class definitions out into separate files and fixing typing
Mikael Nordfeldth [Wed, 6 Jan 2016 18:46:56 +0000 (19:46 +0100)]
Breaking class definitions out into separate files and fixing typing

8 years agoDon't update stored URLs just because we have a filename
Mikael Nordfeldth [Wed, 6 Jan 2016 18:23:38 +0000 (19:23 +0100)]
Don't update stored URLs just because we have a filename

This would overwrite remote URLs with local verisons which removes source href...
The reason one might have filenames for remote URLs is that StoreRemoteMedia plugin
fetches them and uses the filename field.

8 years agoReturn dynamically generated URLs for thumbnails for all locally stored entries
Mikael Nordfeldth [Wed, 6 Jan 2016 18:06:29 +0000 (19:06 +0100)]
Return dynamically generated URLs for thumbnails for all locally stored entries

8 years agoAlways generate notice URLs on the fly for local notices
Mikael Nordfeldth [Wed, 6 Jan 2016 15:24:33 +0000 (16:24 +0100)]
Always generate notice URLs on the fly for local notices

Related to issue #118

8 years agoIssue #118 wanted better TOR support, now Avatar URLs are not stored
Mikael Nordfeldth [Wed, 6 Jan 2016 15:14:26 +0000 (16:14 +0100)]
Issue #118 wanted better TOR support, now Avatar URLs are not stored

There was no reason to store the generated Avatar URLs because it's so
cheap to generate them on the fly.

8 years agoNote in the debug log if we render the HTML of a message
Mikael Nordfeldth [Wed, 6 Jan 2016 14:37:30 +0000 (15:37 +0100)]
Note in the debug log if we render the HTML of a message

8 years agoAvoid having to check for notices without rendered copies in upgrade.php
Mikael Nordfeldth [Wed, 6 Jan 2016 14:32:00 +0000 (15:32 +0100)]
Avoid having to check for notices without rendered copies in upgrade.php

Always call the Notice->getRendered() function to get a rendered copy.
We could perhaps put some sanitation there too in the future

8 years agoGet conversation ID from child too in scripts/upgrade.php
Mikael Nordfeldth [Wed, 6 Jan 2016 13:57:30 +0000 (14:57 +0100)]
Get conversation ID from child too in scripts/upgrade.php

8 years agoSomewhat more meaningful error message
Mikael Nordfeldth [Wed, 6 Jan 2016 13:10:37 +0000 (14:10 +0100)]
Somewhat more meaningful error message

8 years agoConversation IDs (again) no longer based on Notice ID
Mikael Nordfeldth [Wed, 6 Jan 2016 12:58:46 +0000 (13:58 +0100)]
Conversation IDs (again) no longer based on Notice ID

8 years agoMore listitems and lists into separate files + stronger typing
Mikael Nordfeldth [Wed, 6 Jan 2016 00:36:46 +0000 (01:36 +0100)]
More listitems and lists into separate files + stronger typing

8 years agoSeparating classes into files and stronger typing
Mikael Nordfeldth [Wed, 6 Jan 2016 00:30:12 +0000 (01:30 +0100)]
Separating classes into files and stronger typing

8 years agoTyping to Profile
Mikael Nordfeldth [Wed, 6 Jan 2016 00:25:00 +0000 (01:25 +0100)]
Typing to Profile

8 years agoSubscriber lists to separate files and also Profile typing
Mikael Nordfeldth [Tue, 5 Jan 2016 23:57:31 +0000 (00:57 +0100)]
Subscriber lists to separate files and also Profile typing

8 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth [Tue, 5 Jan 2016 23:53:20 +0000 (00:53 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

8 years agoMerge branch 'nightly' into 'nightly'
mmn [Tue, 5 Jan 2016 23:53:08 +0000 (23:53 +0000)]
Merge branch 'nightly' into 'nightly'

only count post-notices (i.e. don't include activity-notices in statuses_count in the API)

See merge request !73

8 years agoMerge request #10 by aroque but in a slightly different version
Mikael Nordfeldth [Tue, 5 Jan 2016 23:48:03 +0000 (00:48 +0100)]
Merge request #10 by aroque but in a slightly different version

8 years ago$notices->verb = ActivityVerb::POST;
hannes [Tue, 5 Jan 2016 23:29:48 +0000 (23:29 +0000)]
$notices->verb = ActivityVerb::POST;

8 years agoMerge branch 'openid-plugin' into 'nightly'
mmn [Tue, 5 Jan 2016 23:28:28 +0000 (23:28 +0000)]
Merge branch 'openid-plugin' into 'nightly'

OpenID plugin: 'openid_only' should be 'openidonly'

To match everywhere else.

See merge request !72

8 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth [Tue, 5 Jan 2016 23:24:41 +0000 (00:24 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

8 years agoMerge branch 'lookup_url_fix' into 'nightly'
mmn [Tue, 5 Jan 2016 23:24:16 +0000 (23:24 +0000)]
Merge branch 'lookup_url_fix' into 'nightly'

makes url lookup work and adds full url to href for shortened links

See merge request !74