]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
9 years agoMerge remote-tracking branch 'upstream/nightly' into nightly
postblue [Fri, 23 Jan 2015 07:26:25 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/nightly' into nightly

9 years agoMerge remote-tracking branch 'upstream/master' into nightly
postblue [Fri, 23 Jan 2015 07:25:47 +0000 (08:25 +0100)]
Merge remote-tracking branch 'upstream/master' into nightly

9 years agoNon-ajax file submissions should throw NoUploadedMediaException
Mikael Nordfeldth [Thu, 22 Jan 2015 11:38:57 +0000 (12:38 +0100)]
Non-ajax file submissions should throw NoUploadedMediaException

9 years agossl_verify_host option in config (default is true)
Mikael Nordfeldth [Thu, 22 Jan 2015 11:21:57 +0000 (12:21 +0100)]
ssl_verify_host option in config (default is true)

9 years agoAdded a quickGet in HTTPClient
Mikael Nordfeldth [Thu, 22 Jan 2015 11:16:01 +0000 (12:16 +0100)]
Added a quickGet in HTTPClient

9 years agoReplace file_get_contents with HTTPClient in testfeed
Mikael Nordfeldth [Thu, 22 Jan 2015 10:30:36 +0000 (11:30 +0100)]
Replace file_get_contents with HTTPClient in testfeed

9 years agoMerge branch 'nightly' of gitorious.org:social/mainline into nightly
Mikael Nordfeldth [Wed, 21 Jan 2015 22:45:49 +0000 (23:45 +0100)]
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

9 years agoEnable AntiBrute by default.
Mikael Nordfeldth [Wed, 21 Jan 2015 22:43:04 +0000 (23:43 +0100)]
Enable AntiBrute by default.

9 years agoAntiBrute plugin, delay + log multiple fail logins
Mikael Nordfeldth [Wed, 21 Jan 2015 22:35:48 +0000 (23:35 +0100)]
AntiBrute plugin, delay + log multiple fail logins

9 years agoAdd simpler delete preference for Profile and User
Mikael Nordfeldth [Wed, 21 Jan 2015 21:59:15 +0000 (22:59 +0100)]
Add simpler delete preference for Profile and User

9 years agoEndCheckPassword should run after Start even if pre-exited
Mikael Nordfeldth [Wed, 21 Jan 2015 21:31:05 +0000 (22:31 +0100)]
EndCheckPassword should run after Start even if pre-exited

StartCheckPassword can exit beforehand either with success or failure,
and we want EndCheckPassword to check for stuff like failed login attempts.

9 years agoOnly check if a nickname exists if site is non-private
Mikael Nordfeldth [Wed, 21 Jan 2015 21:06:27 +0000 (22:06 +0100)]
Only check if a nickname exists if site is non-private

9 years agoOnly check if a nickname exists if site is non-private
Mikael Nordfeldth [Wed, 21 Jan 2015 21:06:27 +0000 (22:06 +0100)]
Only check if a nickname exists if site is non-private

9 years agoMediaFile upload simplifying
Mikael Nordfeldth [Wed, 21 Jan 2015 16:32:57 +0000 (17:32 +0100)]
MediaFile upload simplifying

9 years agoGIF support (I know you love it)
Mikael Nordfeldth [Wed, 21 Jan 2015 15:43:46 +0000 (16:43 +0100)]
GIF support (I know you love it)

make sure you have php5-imagick and then enable with addPlugin('ImageMagick')

9 years agoNewmessageAction lacked the $form property
Mikael Nordfeldth [Wed, 21 Jan 2015 12:02:46 +0000 (13:02 +0100)]
NewmessageAction lacked the $form property

9 years agoxcache plugin is not recommended anymore
Mikael Nordfeldth [Mon, 19 Jan 2015 19:36:29 +0000 (20:36 +0100)]
xcache plugin is not recommended anymore

9 years agoThese were meant for lower classes
Mikael Nordfeldth [Sun, 18 Jan 2015 20:13:52 +0000 (21:13 +0100)]
These were meant for lower classes

9 years agoRegistration coding cleanup
Mikael Nordfeldth [Sun, 18 Jan 2015 12:06:12 +0000 (13:06 +0100)]
Registration coding cleanup

Mainly there was an Undefined variable: code in apiaccountregister.php

9 years agoBad variable reference (needed $this->)
Mikael Nordfeldth [Sun, 18 Jan 2015 11:56:17 +0000 (12:56 +0100)]
Bad variable reference (needed $this->)

9 years agoPHP BUG??? Cannot figure out why this throws warning
Mikael Nordfeldth [Sun, 18 Jan 2015 11:52:33 +0000 (12:52 +0100)]
PHP BUG??? Cannot figure out why this throws warning

I kept getting this on "Quitter EspaƱa" (which seems to be the name
causing the commotion, as it's part of this sprintf algorithm):

   PHP Warning:  sprintf(): Argument number must be greater than zero
    in /srv/www/vhosts/quitter.es/%/htdocs/lib/action.php on line 1175

I'll just make it quiet for now so it doesn't spam other sites with
UTF-8 characters in their name (if that's what's causing this).

9 years agoholy crap, file_put_contents got args in wrong order
Mikael Nordfeldth [Sun, 18 Jan 2015 01:57:08 +0000 (02:57 +0100)]
holy crap, file_put_contents got args in wrong order

9 years agoKeep the old error message on updateAvatar
Mikael Nordfeldth [Sun, 18 Jan 2015 01:48:39 +0000 (02:48 +0100)]
Keep the old error message on updateAvatar

9 years agoUse HTTPClient to download avatar
Mikael Nordfeldth [Sun, 18 Jan 2015 01:44:55 +0000 (02:44 +0100)]
Use HTTPClient to download avatar

also make updateAvatar public so we can call it from update_ostatus_profile.php

9 years agoLoose_Ostatusprofile::updateAvatar was identical to Ostatus_profile
Mikael Nordfeldth [Sun, 18 Jan 2015 01:39:08 +0000 (02:39 +0100)]
Loose_Ostatusprofile::updateAvatar was identical to Ostatus_profile

9 years agoA bit more readable code.
Mikael Nordfeldth [Sun, 18 Jan 2015 00:43:30 +0000 (01:43 +0100)]
A bit more readable code.

9 years agoDon't hide the compose buttons in input_form_nav
Mikael Nordfeldth [Sat, 17 Jan 2015 23:18:28 +0000 (00:18 +0100)]
Don't hide the compose buttons in input_form_nav

9 years agoNo need to say we're finished working
Mikael Nordfeldth [Sat, 17 Jan 2015 12:38:59 +0000 (13:38 +0100)]
No need to say we're finished working

9 years agoIcons slightly too large, broke the line!
Mikael Nordfeldth [Sat, 17 Jan 2015 11:09:50 +0000 (12:09 +0100)]
Icons slightly too large, broke the line!

At least on quitter.es

9 years agotwitPic no longer exists/is active
Mikael Nordfeldth [Sat, 17 Jan 2015 11:07:57 +0000 (12:07 +0100)]
twitPic no longer exists/is active

9 years agospring cleaning in Oembed helper list
Mikael Nordfeldth [Sat, 17 Jan 2015 11:06:08 +0000 (12:06 +0100)]
spring cleaning in Oembed helper list

Fixed http -> https and removed some dead services

9 years agoneo-quitter theme from hannesmannerheim
Mikael Nordfeldth [Fri, 16 Jan 2015 22:27:29 +0000 (23:27 +0100)]
neo-quitter theme from hannesmannerheim

Hopefully we'll maintain it here rather than on the origin repository:
https://github.com/hannesmannerheim/neo-quitter

9 years agoSpacing between .u-photo and .p-name in notices
Mikael Nordfeldth [Fri, 16 Jan 2015 15:36:53 +0000 (16:36 +0100)]
Spacing between .u-photo and .p-name in notices

9 years ago...and don't hide it at all since we don't have a placeholder now
Mikael Nordfeldth [Fri, 16 Jan 2015 11:10:13 +0000 (12:10 +0100)]
...and don't hide it at all since we don't have a placeholder now

9 years agoDon't close main notice input on init if composing
Mikael Nordfeldth [Fri, 16 Jan 2015 11:00:45 +0000 (12:00 +0100)]
Don't close main notice input on init if composing

9 years agoInitially hide input forms on the top
Mikael Nordfeldth [Fri, 16 Jan 2015 10:19:22 +0000 (11:19 +0100)]
Initially hide input forms on the top

The status input element would attract focus after page load, meaning
if you'd scrolled down a bit then you would be rocketed back up again!

9 years agoversion push, we've got some HTML/CSS changes
Mikael Nordfeldth [Fri, 16 Jan 2015 00:12:19 +0000 (01:12 +0100)]
version push, we've got some HTML/CSS changes

9 years agoAdd nohub config setting to allowed non-PuSH feeds
Mikael Nordfeldth [Fri, 16 Jan 2015 00:10:55 +0000 (01:10 +0100)]
Add nohub config setting to allowed non-PuSH feeds

9 years agoremoved debugging lines for FeedPoller
Mikael Nordfeldth [Thu, 15 Jan 2015 20:14:07 +0000 (21:14 +0100)]
removed debugging lines for FeedPoller

9 years agoRSS feed items did not get a type assigned
Mikael Nordfeldth [Thu, 15 Jan 2015 20:13:21 +0000 (21:13 +0100)]
RSS feed items did not get a type assigned

9 years agoFeedPoller plugin, for hubless feeds
Mikael Nordfeldth [Wed, 14 Jan 2015 00:16:28 +0000 (01:16 +0100)]
FeedPoller plugin, for hubless feeds

9 years agoMerge remote-tracking branch 'upstream/nightly' into nightly
postblue [Tue, 13 Jan 2015 21:46:16 +0000 (22:46 +0100)]
Merge remote-tracking branch 'upstream/nightly' into nightly

9 years agoEnsuring unknown profiles in salmon slaps work again
Mikael Nordfeldth [Tue, 13 Jan 2015 12:43:18 +0000 (13:43 +0100)]
Ensuring unknown profiles in salmon slaps work again

9 years agoBetter test to see if uploaded media exists
Mikael Nordfeldth [Tue, 13 Jan 2015 12:22:23 +0000 (13:22 +0100)]
Better test to see if uploaded media exists

9 years agoAbort on failure instead of return early success
Mikael Nordfeldth [Tue, 13 Jan 2015 12:18:57 +0000 (13:18 +0100)]
Abort on failure instead of return early success

9 years agoThose variables were set for a reason
Mikael Nordfeldth [Tue, 13 Jan 2015 11:56:56 +0000 (12:56 +0100)]
Those variables were set for a reason

The ->_subscription variable etc. were set because they were used later.

9 years agoMerge remote-tracking branch 'upstream/nightly' into nightly
postblue [Tue, 13 Jan 2015 07:53:34 +0000 (08:53 +0100)]
Merge remote-tracking branch 'upstream/nightly' into nightly

9 years agogetUrl() fixed for File and File_thumbnail to correct http/https stuff and other
Mikael Nordfeldth [Mon, 12 Jan 2015 18:22:10 +0000 (19:22 +0100)]
getUrl() fixed for File and File_thumbnail to correct http/https stuff and other

9 years agoWhen called in offline queue, File::url was HTTP
Mikael Nordfeldth [Mon, 12 Jan 2015 17:56:19 +0000 (18:56 +0100)]
When called in offline queue, File::url was HTTP

Despite having the site configured "always" for HTTPS, File generated
thumbnails and such with HTTP urls.

9 years agoMerge remote-tracking branch 'upstream/nightly' into nightly
postblue [Mon, 12 Jan 2015 13:12:47 +0000 (14:12 +0100)]
Merge remote-tracking branch 'upstream/nightly' into nightly

9 years agonewnotice action always returns the notice's URL
Mikael Nordfeldth [Mon, 12 Jan 2015 11:13:34 +0000 (12:13 +0100)]
newnotice action always returns the notice's URL

Maybe could return conversation URL, but this will do for now.
Courtesy of the Javascript haters.

9 years agoMake sure we add ajax=1 to inputform if using javascript
Mikael Nordfeldth [Mon, 12 Jan 2015 11:13:03 +0000 (12:13 +0100)]
Make sure we add ajax=1 to inputform if using javascript

9 years agoArrayWrapper spookiness, must make sure it's a Notice there...
Mikael Nordfeldth [Mon, 12 Jan 2015 11:06:19 +0000 (12:06 +0100)]
ArrayWrapper spookiness, must make sure it's a Notice there...

9 years agoensureActivityObjectProfile is more thorough than createAct...
Mikael Nordfeldth [Mon, 12 Jan 2015 10:47:21 +0000 (11:47 +0100)]
ensureActivityObjectProfile is more thorough than createAct...

9 years agoSimplified by adding an abstract AtompubAction
Mikael Nordfeldth [Mon, 12 Jan 2015 02:15:41 +0000 (03:15 +0100)]
Simplified by adding an abstract AtompubAction

9 years agoThe real [Start|End]NewAtomPubActivity event definition
Mikael Nordfeldth [Mon, 12 Jan 2015 01:28:03 +0000 (02:28 +0100)]
The real [Start|End]NewAtomPubActivity event definition

9 years agoFound some unreachable code in Favorite
Mikael Nordfeldth [Mon, 12 Jan 2015 01:23:23 +0000 (02:23 +0100)]
Found some unreachable code in Favorite

The portion after StartAtomPubNewActivity would never be reached since
Favorite handles that activity through ActivityHandlerPlugin nowadays.
So I cleaned it up and followed a couple of paths, making stuff prettier.

9 years agoensureProfile already done and stored in $this->oprofile
Mikael Nordfeldth [Mon, 12 Jan 2015 01:01:26 +0000 (02:01 +0100)]
ensureProfile already done and stored in $this->oprofile

9 years agoMerge remote-tracking branch 'upstream/nightly' into nightly
postblue [Sat, 10 Jan 2015 19:38:12 +0000 (20:38 +0100)]
Merge remote-tracking branch 'upstream/nightly' into nightly

9 years agoMerge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into...
postblue [Sat, 10 Jan 2015 19:26:54 +0000 (20:26 +0100)]
Merge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into merge-requests/28

9 years agoSupport for updated aliases
Mikael Nordfeldth [Sat, 10 Jan 2015 01:07:39 +0000 (02:07 +0100)]
Support for updated aliases

will verify unknown aliases against old ones if the new identifies as a
previously recognized URI.

Steps:
1. Check the newly received URI. Who does it say it is?
2. Compare these alleged identities to our local database.
3. If we found any locally stored identities, ask it about its aliases.
4. Do any of the aliases from our known identity match the recently introduced one?

Currently we do _not_ update the ostatus_profile table with the new URI.

9 years agoabstract declaration of GroupSection
Mikael Nordfeldth [Sat, 10 Jan 2015 00:46:54 +0000 (01:46 +0100)]
abstract declaration of GroupSection

9 years agosection control over their notice lists + HTML id stuff
Mikael Nordfeldth [Fri, 9 Jan 2015 14:46:35 +0000 (15:46 +0100)]
section control over their notice lists + HTML id stuff

9 years agostyling fixes to primary aside section
Mikael Nordfeldth [Thu, 8 Jan 2015 19:38:11 +0000 (20:38 +0100)]
styling fixes to primary aside section

9 years agoActually use the PrimaryNoticeList in actions
Mikael Nordfeldth [Thu, 8 Jan 2015 19:29:09 +0000 (20:29 +0100)]
Actually use the PrimaryNoticeList in actions

9 years agonew noticelist classes for primary and section lists
Mikael Nordfeldth [Thu, 8 Jan 2015 19:19:43 +0000 (20:19 +0100)]
new noticelist classes for primary and section lists

9 years agoReuse NoticeList for NoticeSection listing
Mikael Nordfeldth [Thu, 8 Jan 2015 19:07:10 +0000 (20:07 +0100)]
Reuse NoticeList for NoticeSection listing

Something smarter than the 'addressees' and 'attachments' booleans etc.
is desired.

9 years agoCC license fixes (no remote image, https for href)
Mikael Nordfeldth [Thu, 8 Jan 2015 17:13:33 +0000 (18:13 +0100)]
CC license fixes (no remote image, https for href)

9 years agostatus update placeholder removed, javascript not required to post
Mikael Nordfeldth [Thu, 8 Jan 2015 17:04:46 +0000 (18:04 +0100)]
status update placeholder removed, javascript not required to post

9 years agoDon't show notice form navs on newnotice action
Mikael Nordfeldth [Thu, 8 Jan 2015 16:33:09 +0000 (17:33 +0100)]
Don't show notice form navs on newnotice action

9 years agoMerge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Thu, 8 Jan 2015 15:48:42 +0000 (16:48 +0100)]
Merge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into merge-requests/28

9 years agoHTML5 + CSS adaptions, may cause visual breaks
Mikael Nordfeldth [Thu, 8 Jan 2015 15:42:26 +0000 (16:42 +0100)]
HTML5 + CSS adaptions, may cause visual breaks

9 years agoOStatusPlugin: fix ensureProfile catch-22 in onCheckActivityAuthorship()
Joshua Judson Rosen [Wed, 31 Dec 2014 04:56:33 +0000 (23:56 -0500)]
OStatusPlugin: fix ensureProfile catch-22 in onCheckActivityAuthorship()

Use profile URL (not URI), like elsewhere.

Profile::getUri() doesn't actually do anything useful, here--
it does nothing unless a plugin (like OStatus) is already
able to resolve the Profile into a backend object (e.g.: an Ostatus_profile).

If we might not already have an Ostatus_profile for a given Profile,
then we need to use $profile->getUrl() and fetch the data from that URL.

9 years agoDocumentation updates
Mikael Nordfeldth [Wed, 10 Dec 2014 20:26:23 +0000 (21:26 +0100)]
Documentation updates

Apparently we had two installation instructions, one of which were incomplete.

9 years agoUsage documentation in the stopdaemons script
Mikael Nordfeldth [Wed, 10 Dec 2014 20:17:57 +0000 (21:17 +0100)]
Usage documentation in the stopdaemons script

9 years agoMerge commit 'refs/merge-requests/25' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Wed, 10 Dec 2014 11:42:19 +0000 (12:42 +0100)]
Merge commit 'refs/merge-requests/25' of https://gitorious.org/social/mainline into merge-requests/25

9 years agoColumns too narrow in mobileprofile
Mikael Nordfeldth [Wed, 10 Dec 2014 11:28:38 +0000 (12:28 +0100)]
Columns too narrow in mobileprofile

9 years agoMerge commit 'refs/merge-requests/26' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Tue, 9 Dec 2014 12:45:15 +0000 (13:45 +0100)]
Merge commit 'refs/merge-requests/26' of https://gitorious.org/social/mainline into merge-requests/26

9 years agoMerge commit 'refs/merge-requests/27' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Tue, 9 Dec 2014 12:30:47 +0000 (13:30 +0100)]
Merge commit 'refs/merge-requests/27' of https://gitorious.org/social/mainline into merge-requests/27

9 years agoConsistently root autostitched conversations at the oldest notice.
Joshua Judson Rosen [Tue, 9 Dec 2014 03:39:36 +0000 (22:39 -0500)]
Consistently root autostitched conversations at the oldest notice.

9 years agoOStatus/scripts/update-profile-data.php: print updated fullnames
Joshua Judson Rosen [Tue, 9 Dec 2014 03:06:29 +0000 (22:06 -0500)]
OStatus/scripts/update-profile-data.php: print updated fullnames

Now that we can actually update them again.

9 years agoParse remote users' fullnames from PoCo::displayName elements
Joshua Judson Rosen [Tue, 9 Dec 2014 02:55:51 +0000 (21:55 -0500)]
Parse remote users' fullnames from PoCo::displayName elements

Try this first; use activity:subject->atom:title only as a fallback.

The code that output activity:subject was removed 2013-10-08,
and it it was deprecated for years before that....

9 years agoStronger typing in Ostatus_profile
Mikael Nordfeldth [Mon, 8 Dec 2014 18:52:00 +0000 (19:52 +0100)]
Stronger typing in Ostatus_profile

9 years agostopdaemons.sh: pass site-specifier args through to getvaliddaemons.php
Joshua Judson Rosen [Sat, 6 Dec 2014 23:54:15 +0000 (18:54 -0500)]
stopdaemons.sh: pass site-specifier args through to getvaliddaemons.php

9 years agoMerge commit 'refs/merge-requests/19' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Sat, 6 Dec 2014 19:18:52 +0000 (20:18 +0100)]
Merge commit 'refs/merge-requests/19' of https://gitorious.org/social/mainline into merge-requests/19

9 years agoMerge commit 'refs/merge-requests/23' of https://gitorious.org/social/mainline into...
Mikael Nordfeldth [Sat, 6 Dec 2014 19:12:17 +0000 (20:12 +0100)]
Merge commit 'refs/merge-requests/23' of https://gitorious.org/social/mainline into merge-requests/23

9 years agoAvoid undefined variables.
Mikael Nordfeldth [Sat, 6 Dec 2014 18:56:21 +0000 (19:56 +0100)]
Avoid undefined variables.

9 years agoRevert "Report a 404 not found if no posts found for User timeline"
Mikael Nordfeldth [Thu, 4 Dec 2014 18:45:27 +0000 (19:45 +0100)]
Revert "Report a 404 not found if no posts found for User timeline"

This reverts commit 5295e8d4de9c20ee06c3219669f5824c492478f9.

Just reply with an empty timeline...

9 years agoUse HTTPS links for Google and Yahoo!
Joshua Judson Rosen [Thu, 4 Dec 2014 03:55:34 +0000 (22:55 -0500)]
Use HTTPS links for Google and Yahoo!
They both support it--so why not?

9 years agoAdd Ixquick as a fallback search link
Joshua Judson Rosen [Thu, 4 Dec 2014 03:54:27 +0000 (22:54 -0500)]
Add Ixquick as a fallback search link

People like that one, too.

9 years agoAdd DuckDuckGo as a fallback search link
Joshua Judson Rosen [Thu, 4 Dec 2014 03:48:28 +0000 (22:48 -0500)]
Add DuckDuckGo as a fallback search link

People like it.

9 years agoCorrectly spell "Yahoo!"
Joshua Judson Rosen [Thu, 4 Dec 2014 03:46:50 +0000 (22:46 -0500)]
Correctly spell "Yahoo!"

With the trailing bang(!).

9 years agoSearchAction: don't list dead web search-engines
Joshua Judson Rosen [Thu, 4 Dec 2014 03:44:54 +0000 (22:44 -0500)]
SearchAction: don't list dead web search-engines

tweetscan.com is a parked domain.

http://www.twingly.com/search?content=microblog says:
"Microblog search has been removed. Use https://twitter.com/search-home".

http://collecta.com/ says "We have removed our consumer facing site".

9 years agodelete groups from groups directory, for admins
Hannes Mannerheim [Fri, 7 Nov 2014 14:44:22 +0000 (15:44 +0100)]
delete groups from groups directory, for admins

9 years agoMerge aqeeliz's commit 'refs/merge-requests/20' of git://gitorious.org/social/mainlin...
Mikael Nordfeldth [Tue, 2 Dec 2014 13:53:33 +0000 (14:53 +0100)]
Merge aqeeliz's commit 'refs/merge-requests/20' of git://gitorious.org/social/mainline into merge-requests/20

9 years agocommon_path(): use HTTPS if current URL is HTTPS
Joshua Judson Rosen [Sat, 29 Nov 2014 05:30:11 +0000 (00:30 -0500)]
common_path(): use HTTPS if current URL is HTTPS

Bring common_path() back into harmony with common_local_url(),
which started doing this 2013-03-25.

Shouldn't need to spread "StatusNet::isHTTPS()" logic all over
wherever common_path() is called; just DTRT automatically instead.

9 years agodebug output was referencing wrong variable
Mikael Nordfeldth [Mon, 1 Dec 2014 18:19:16 +0000 (19:19 +0100)]
debug output was referencing wrong variable

9 years agoMerge remote-tracking branch 'upstream/master'
postblue [Thu, 27 Nov 2014 20:47:32 +0000 (21:47 +0100)]
Merge remote-tracking branch 'upstream/master'

9 years agoConversation URIs could be NULL on upgrade
Mikael Nordfeldth [Thu, 27 Nov 2014 17:56:57 +0000 (18:56 +0100)]
Conversation URIs could be NULL on upgrade

9 years agoMerge remote-tracking branch 'upstream/master'
postblue [Thu, 27 Nov 2014 16:54:11 +0000 (17:54 +0100)]
Merge remote-tracking branch 'upstream/master'