* remotes/upstream/master: (21 commits)
more logging on pubsub callbacks
provide ability to autofriend ostatus accounts
ostatus hub subscription issues
better events-reminder theming
png support for embedded private photos
rev update
png support: update database.sql, fix some typos, fix tinymce image browser
Add support for PNG images with alpha
fix a random profile error message
events: fix select events query select events that starts before display start date and/or ends after display end date.
more logging on subscribe_to_hub
admin page untranslated strings, remove empty list element for update
A few corrections in German translations.
rev update
set minchars to 2 for PM lookups too
set minchars to 2 for contacts search
contacts search autocomplete
add email probe logging, limit typo check to main addon files and skip additional support files
rev update
named anchors on display page
...
* remotes/upstream/master:
rev update
database updates
Debugged implementation of Diaspora relayable_retractions
cleanup and logging
first shot at getting like/unlike functions to work consistently
Fix bugs in the retraction code
prepare to implement database update
Implement relaying of relayable_retractions
Support relayable_retractions that are relayed to us by the top-level post owner
quattro: admin panel styling and 1st buttons for addon/theme overview
privacy settings: make submit button translateable
DE: update to the strings
prv messages: make submit translateable
Zach Prezkuta [Sun, 3 Jun 2012 20:32:17 +0000 (14:32 -0600)]
Debugged implementation of Diaspora relayable_retractions
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:
Friendica top-level post:
Diaspora comment deleted, disappears in Friendica
Friendica comment deleted, disappears in Diaspora
Diaspora like retracted, disappears in Friendica
Friendica like retracted, disappears in Diaspora
Diaspora top-level post:
Same
There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.
Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
Zach Prezkuta [Sat, 2 Jun 2012 22:11:31 +0000 (16:11 -0600)]
Fix bugs in the retraction code
Currently, the following seems to be the functional status:
For a Diaspora top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete for top-level owner
Diaspora comments show up for non-owner
Diaspora comments sometimes don't delete for non-owner
-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log
Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
Diaspora likes show up
Diaspora non-owner can't unlike
-> Same as comments, seems to be Diaspora's fault
For a Friendica top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete
Friendica likes don't show up in Diaspora sometimes
Friendica doesn't even message Diaspora for unlikes (sometimes?)
Diaspora likes and unlikes work
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* remotes/upstream/master:
registration issue after re-factor
install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
admin: remove update link in admin menu
root [Fri, 1 Jun 2012 07:31:24 +0000 (03:31 -0400)]
install: fix bug #436 and small typo
Function check_htaccess() don't perform check if curl is not installed.
This was leading to wsod beacuse check_htaccess() uses fetch_url().
* remotes/upstream/master:
turn registration code into a standalone function for re-use
query using both `id` and `parent`
prevent email from leaking in feeds
y didn't i think of this b4?
some zero theming on settings page
missing delimiter
transition to beta for private forums
rev update
Friendicaland - you can't 'live' on a demo server.
Create a "potential default group" called "Friends" on registration.
fix private photos that also have a size specification
private group tests, cont.
hide private group if desired
prvgroup should see intros
private group fix
possible sql injection in search
bugfixes: private photo embeds and search for strings with %
projects / friendica.git / log