Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge upstream, slider work, refactor ping module, language selection work | friendica | 2012-07-13 | 1 | -26/+43 |
| | |||||
* | upstream fixes and a lot of taxonomy stuff | friendica | 2012-07-10 | 1 | -4/+4 |
| | |||||
* | slightly better way of handling last loop | Zach Prezkuta | 2012-07-05 | 1 | -1/+3 |
| | |||||
* | add some timeouts to prevent deadlock | Zach Prezkuta | 2012-07-05 | 1 | -2/+10 |
| | |||||
* | add rudimentary locking capability to Friendica functions | Zach Prezkuta | 2012-07-05 | 1 | -20/+77 |
| | |||||
* | render the recycle symbol correctly on Diaspora reshares | friendica | 2012-07-04 | 1 | -1/+1 |
| | |||||
* | ok now I'm just making silly mistakes--take out premature function locking code | Zach Prezkuta | 2012-06-23 | 1 | -77/+20 |
| | |||||
* | use author handle instead of sender handle | Zach Prezkuta | 2012-06-23 | 1 | -24/+84 |
| | |||||
* | allow linking to Diaspora's scaled-down images | Zach Prezkuta | 2012-06-23 | 1 | -1/+2 |
| | |||||
* | Merge remote branch 'upstream/master' | Michael Vogel | 2012-06-23 | 1 | -52/+28 |
|\ | | | | | | | | | Conflicts: include/bb2diaspora.php | ||||
| * | create new signed text for relayables right when relaying them | Zach Prezkuta | 2012-06-20 | 1 | -52/+28 |
| | | |||||
* | | Diaspora: Messages are now looking better | Michael Vogel | 2012-06-23 | 1 | -2/+18 |
| | | |||||
* | | New function to convert bbcode to markdown. | Michael Vogel | 2012-06-17 | 1 | -4/+4 |
|/ | |||||
* | more cleanup | Zach Prezkuta | 2012-06-16 | 1 | -15/+0 |
| | |||||
* | some cleanup of obsolete code | Zach Prezkuta | 2012-06-16 | 1 | -31/+6 |
| | |||||
* | still need the original author information for comments and likes | Zach Prezkuta | 2012-06-16 | 1 | -0/+24 |
| | |||||
* | update signature checking for relayables | Zach Prezkuta | 2012-06-16 | 1 | -69/+122 |
| | |||||
* | Debugged implementation of Diaspora relayable_retractions | Zach Prezkuta | 2012-06-03 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | cleanup and logging | Zach Prezkuta | 2012-06-03 | 1 | -22/+20 |
| | |||||
* | first shot at getting like/unlike functions to work consistently | Zach Prezkuta | 2012-06-03 | 1 | -8/+14 |
| | |||||
* | Fix bugs in the retraction code | Zach Prezkuta | 2012-06-03 | 1 | -35/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | Implement relaying of relayable_retractions | Zach Prezkuta | 2012-06-03 | 1 | -29/+122 |
| | | | | Also: some whitespace cleanup, fix Diaspora parent DB query | ||||
* | Support relayable_retractions that are relayed to us by the top-level post owner | Zach Prezkuta | 2012-06-03 | 1 | -9/+37 |
| | |||||
* | turn registration code into a standalone function for re-use | friendica | 2012-05-31 | 1 | -4/+4 |
| | |||||
* | query using both `id` and `parent` | Zach Prezkuta | 2012-05-31 | 1 | -2/+10 |
| | |||||
* | more private forums, default privacy group for new contacts | friendica | 2012-05-17 | 1 | -0/+8 |
| | |||||
* | If a contact has had delivery issues in the last 15 minutes, send new posts ↵ | friendica | 2012-05-07 | 1 | -6/+12 |
| | | | | | | | straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly. | ||||
* | separate tag search from body search | friendica | 2012-04-23 | 1 | -6/+6 |
| | |||||
* | bug #388 - notify_comment received after post deleted | friendica | 2012-04-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -9/+30 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | also block outbound | friendica | 2012-04-04 | 1 | -0/+5 |
| | | |||||
| * | log disabled requests | friendica | 2012-04-04 | 1 | -2/+6 |
| | | |||||
| * | bug: diaspora_enabled setting turns it on but doesn't fully turn it off. | friendica | 2012-04-04 | 1 | -0/+8 |
| | | |||||
| * | add title to D* posts | friendica | 2012-04-01 | 1 | -1/+5 |
| | | |||||
| * | some reported warnings cleaned up | friendica | 2012-03-28 | 1 | -6/+6 |
| | | |||||
| * | block filed items from deletion | friendica | 2012-03-24 | 1 | -2/+2 |
|/ | |||||
* | wrong link in d* comment notifications | friendica | 2012-03-16 | 1 | -1/+1 |
| | |||||
* | notification for disapora comments | friendica | 2012-03-16 | 1 | -0/+42 |
| | |||||
* | scale external images | friendica | 2012-02-25 | 1 | -6/+6 |
| | |||||
* | string update for 2.38 | friendica | 2012-02-24 | 1 | -0/+3 |
| | |||||
* | allow forum posts by followers on Diaspora | friendica | 2012-02-22 | 1 | -7/+19 |
| | |||||
* | new notifications - implement storage | friendica | 2012-02-18 | 1 | -0/+1 |
| | |||||
* | another sql typo | friendica | 2012-02-16 | 1 | -1/+1 |
| | |||||
* | sql typo in auto-friend with D* | friendica | 2012-02-15 | 1 | -1/+1 |
| | |||||
* | don't link tags enclosed inside Diaspora links | friendica | 2012-02-07 | 1 | -0/+26 |
| | |||||
* | restore diaspora test mode | friendica | 2012-01-26 | 1 | -1/+6 |
| | |||||
* | more logging of D* photo transactions | friendica | 2012-01-22 | 1 | -1/+8 |
| | |||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | send diaspora share notification back to originator for auto friending | friendica | 2012-01-05 | 1 | -21/+4 |
| | |||||
* | support auto-friend page types for Diaspora | friendica | 2012-01-04 | 1 | -3/+50 |
| |