This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Here are the files that have conflicts during the merge. | |
Last master commit was a1c30ac096f824c3851afb43665db64ebb2a0fd3 | |
updated 35 locale files [ci skip] by MrZYX | |
Last diaspora-pistos-1.0.5 commit was 7156dcc5205ed9224682069716b9d80f57611147 | |
Merge branch 'groups' into diaspora-pistos-1.0.5 by Pistos | |
# Unmerged paths: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As of 07-Jan-2012 | |
Implemented Features From Pistos: | |
comment-preview-2 | |
view-own-profile-button | |
post-hint-in-notifications | |
federation-subscription-3 | |
maxwell--fix-photo-feature | |
vcuculo--2488-fix-oembed |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Worker | |
www.calispora.org:2569 on RECEIVE_SALMON at 1 day ago Retry or Remove | |
Class | |
Jobs::ReceiveEncryptedSalmon | |
Arguments | |
102 | |
" <?xml version='1.0' encoding='UTF-8'?>\n <diaspora xmlns=\"https://joindiaspora.com/protocol\" xmlns:me=\"http://salmon-protocol.org/ns/magic-env\">\n <encrypted_header>\n eyJjaXBoZXJ0ZXh0IjoiNVYrL292bDVlRzdTakNBUCtnRG10dWxXaHJoeU1ZMnBGY1dPTllCRXFJb0N0R2JicGhweStxeE1OVVp5ZGhNVGM0SjQ5VE9nWmZpWkt1YWFZK2x2dTN0a2RGTVVQeTRaekhQQ0lzeGRMaFBZVXVLcDZ1d3h4VHVweUE2OTBidTZpTjlXSUFIKzVzN1hTd3VjQVFNdXMrRStWUHFDTkxVK3IzZDRVbXlrdTFIRmg3SDJqS291SkVMdUJTZElJZVphbEFTeWxwR3JSMHFyd3NFR2FSbyszMmtOZkFiRHBDVzUxM25ONzFKVzJnQy9yVGtIeUhJZG1LSC9GUUx2VjBGZlB4bGRVQU1LZWRsSjBnWGFIUURiR2c9PSIsImFlc19rZXkiOiJzV3M1MWN5ZXpUOFZVd3laSjNlaWl4UFdycnZQVUMyYlJUQTlGdHY1STV1Q3MrUVFBdmNsNytPQ3pSdmhnVmYxNU1UUFZpY3JscU9WWTFsR20xTmg3Mk5DemFSazIrRmpzWW1mbkt3ZFdHUUxLSUlvdm84WFNTRkNOQUNNejFmd09aR3l5RTBXTXdMMFVkN2J4V05JOTJFYnNyd3VJZFNheTl1QkgxVWxRMmovbjdDaGFQWDhrUEI3RFRoODMwNlJFQVg4cGs3MXRoUFdJcDJ6UXMrTzVU |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A snippet of log from a failed post: | |
Started POST "/preview.json" for 68.5.48.35 at Fri Jan 13 06:13:07 +0000 2012 | |
Processing by PostsController#preview as JSON | |
Parameters: {"text"=>"[FILTERED]"} | |
Completed 200 OK in 5ms (Views: 0.6ms | ActiveRecord: 0.2ms) | |
Started POST "/status_messages" for 68.5.48.35 at Fri Jan 13 06:14:25 +0000 2012 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 39a86ebc2c91a6cbb4f27b7555be9c208d437d1d Mon Sep 17 00:00:00 2001 | |
From: Dave Yingling <[email protected]> | |
Date: Tue, 17 Jan 2012 08:53:33 -0800 | |
Subject: [PATCH] add nsfw shield by ms and rh | |
--- | |
app/helpers/stream_element_helper.rb | 8 ++++++++ | |
app/models/status_message.rb | 5 +++++ | |
app/views/shared/_stream_element.html.haml | 16 +++++++++------- | |
.../status_messages/_status_message.html.haml | 1 - |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
search own comments and posts: | |
ISSUE: | |
This was giving a 500 error on my pod running mysql: | |
for example, where the query was for "single": | |
Mysql2::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ILIKE '%single%') ORDER BY created_at desc LIMIT 30' at line 1: SELECT `posts`.* FROM `posts` WHERE (`posts`.author_id = 1) AND (text ILIKE '%single%') ORDER BY created_at desc LIMIT 30 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<div class='photo_attachments'> | |
<div class='big_stream_photo'> | |
<a href="/photos/12407" class="stream-photo-link"><img alt="Scaled_full_a32b35eb0af40faeed63" class="stream-photo" data-full-photo="https://calispora.s3.amazonaws.com/uploads/images/a32b35eb0af40faeed63.png" data-small-photo="https://calispora.s3.amazonaws.com/uploads/images/thumb_medium_a32b35eb0af40faeed63.png" src="https://calispora.s3.amazonaws.com/uploads/images/scaled_full_a32b35eb0af40faeed63.png" /></a> | |
</div> | |
</div> | |
<div class='ltr '> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ActiveRecord::StatementInvalid in MultisController#index | |
Mysql2::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read = 1 | |
) ORDER BY id DESC LIMIT 5' at line 6: SELECT `chat_messages`.* FROM `chat_messages` WHERE ( | |
( | |
recipient_id = 3 AND author_id = 2 | |
OR recipient_id = 2 AND author_id = 3 | |
) | |
AND read = 1 | |
) ORDER BY id DESC LIMIT 5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diaspora Federation Tests | |
Background: | |
A limited post with a photo and a limited post without a photo are send out from each of 5 pods | |
and should be seen by accounts on the remaining pods (a 5-way pool). Results are checked after | |
30 minutes. Federation FAILS are shown below. Otherwise, it should be assumed the federation | |
succeeded. | |
Pods: calispora.org, diasp0ra.ca, diasp.eu, diasp.org, and joindiaspora.com | |
The first two pods are running a variation of diaspora-pistos. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Started POST "/blocks?block[person_id]=5406" for 68.4.205.245 at Fri Feb 24 02:56:41 +0000 2012 pid=28521 time=1330052201 | |
Processing by BlocksController#create as HTML pid=28521 time=1330052201 | |
Parameters: {"authenticity_token"=>"/MLWI/xa2vE/hJH+fqsQSwGbgTZk7z0znP72UDW8+nc=", "block"=>{"person_id"=>"5406"}} pid=28521 time=1330052201 | |
event=disconnect [email protected] [email protected] pid=28521 time=1330052201 | |
Completed 500 Internal Server Error in 244ms pid=28521 time=1330052201 | |
** [Hoptoad] Failure: Net::HTTPClientError pid=28521 time=1330052201 | |
** [Hoptoad] Environment Info: [Ruby: 1.8.7] [Rails: 3.0.11] [Env: production] pid=28521 time=1330052201 | |
** [Hoptoad] Response from Hoptoad: | |
<?xml version="1.0" encoding="UTF-8"?> | |
<errors> |
OlderNewer