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
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
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
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: |
NewerOlder