Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-03 | 23 | -990/+1565 |
|\ | |||||
| * | Merge pull request #323 from ↵ | friendica | 2012-06-03 | 12 | -77/+371 |
| |\ | | | | | | | | | | | | | fermionic/add-relayable-retraction-support-for-diaspora Add relayable retraction support for diaspora | ||||
| | * | database updates | Zach Prezkuta | 2012-06-03 | 3 | -8/+7 |
| | | | |||||
| | * | Debugged implementation of Diaspora relayable_retractions | Zach Prezkuta | 2012-06-03 | 3 | -28/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -22/+142 |
| | | | |||||
| | * | Fix bugs in the retraction code | Zach Prezkuta | 2012-06-03 | 7 | -65/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | prepare to implement database update | Zach Prezkuta | 2012-06-03 | 1 | -1/+11 |
| | | | |||||
| | * | Implement relaying of relayable_retractions | Zach Prezkuta | 2012-06-03 | 8 | -43/+194 |
| | | | | | | | | | | | | 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 | 3 | -9/+39 |
| |/ | |||||
| * | quattro: admin panel styling and 1st buttons for addon/theme overview | Tobias Diekershoff | 2012-06-03 | 6 | -65/+281 |
| | | |||||
| * | privacy settings: make submit button translateable | Tobias Diekershoff | 2012-06-03 | 1 | -1/+1 |
| | | |||||
| * | DE: update to the strings | Tobias Diekershoff | 2012-06-03 | 2 | -845/+909 |
| | | |||||
| * | prv messages: make submit translateable | Tobias Diekershoff | 2012-06-03 | 2 | -2/+3 |
| | | |||||
* | | rev update | friendica | 2012-06-03 | 2 | -285/+293 |
|/ | |||||
* | zrl's when visiting public photos at the source site | friendica | 2012-06-03 | 1 | -0/+6 |
| | |||||
* | doco | friendica | 2012-06-02 | 1 | -0/+12 |
| | |||||
* | cleanup | friendica | 2012-06-02 | 1 | -1/+3 |
| | |||||
* | turn "follow" into a function | friendica | 2012-06-02 | 2 | -217/+236 |
| | |||||
* | add hometown to profiles | friendica | 2012-06-02 | 8 | -4/+34 |
| | |||||
* | bug #439 - remove web port number from notification email "from" address | friendica | 2012-06-02 | 1 | -0/+3 |
| | |||||
* | webfinger profile linker | friendica | 2012-06-02 | 5 | -213/+246 |
| | |||||
* | "howlong" added to marital status. | friendica | 2012-06-02 | 8 | -5/+33 |
| | |||||
* | fewer "bob smith to bob smith via wall-to-wall". | friendica | 2012-06-02 | 6 | -21/+36 |
| | |||||
* | Merge pull request #321 from beardy-unixer/master | friendica | 2012-06-01 | 1 | -1/+1 |
|\ | | | | | BB code [quote=somebody] fix. | ||||
| * | [quote=somebody] was appearing as an extended spoiler tag. | Thomas Willingham | 2012-06-01 | 1 | -1/+1 |
| | | |||||
* | | registration issue after re-factor | friendica | 2012-06-01 | 4 | -164/+167 |
|/ | |||||
* | Merge pull request #320 from fabrixxm/master | friendica | 2012-06-01 | 2 | -12/+19 |
|\ | | | | | Fix bug 436, fix small typo, and incomplete feature removal | ||||
| * | install: fix bug #436 and small typo | root | 2012-06-01 | 1 | -11/+18 |
| | | | | | | | | | | Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url(). | ||||
| * | Merge remote branch 'friendica/master' | root | 2012-06-01 | 55 | -1416/+1667 |
| |\ | |/ |/| | |||||
* | | turn registration code into a standalone function for re-use | friendica | 2012-05-31 | 5 | -436/+494 |
| | | |||||
* | | Merge pull request #319 from fermionic/fix-diaspora-parent-query | friendica | 2012-05-31 | 1 | -2/+10 |
|\ \ | | | | | | | query using both `id` and `parent` | ||||
| * | | query using both `id` and `parent` | Zach Prezkuta | 2012-05-31 | 1 | -2/+10 |
|/ / | |||||
* | | prevent email from leaking in feeds | friendica | 2012-05-30 | 1 | -0/+4 |
| | | |||||
* | | y didn't i think of this b4? | friendica | 2012-05-30 | 1 | -0/+4 |
| | | |||||
* | | some zero theming on settings page | friendica | 2012-05-30 | 4 | -12/+26 |
| | | |||||
* | | missing delimiter | friendica | 2012-05-30 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | Friendicaland - you can't 'live' on a demo server. | Thomas Willingham | 2012-05-30 | 1 | -1/+1 |
| | | | |||||
* | | | transition to beta for private forums | friendica | 2012-05-30 | 2 | -3/+0 |
| | | | |||||
* | | | rev update | friendica | 2012-05-30 | 3 | -168/+172 |
| | | | |||||
* | | | Create a "potential default group" called "Friends" on registration. | friendica | 2012-05-30 | 1 | -0/+5 |
| | | | |||||
* | | | fix private photos that also have a size specification | friendica | 2012-05-30 | 1 | -2/+2 |
|/ / | |||||
* | | private group tests, cont. | friendica | 2012-05-29 | 8 | -24/+54 |
| | | |||||
* | | hide private group if desired | friendica | 2012-05-29 | 2 | -6/+14 |
| | | |||||
* | | prvgroup should see intros | friendica | 2012-05-29 | 1 | -1/+1 |
| | | |||||
* | | private group fix | friendica | 2012-05-29 | 1 | -1/+1 |
| | | |||||
* | | possible sql injection in search | friendica | 2012-05-29 | 2 | -3/+3 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-29 | 13 | -111/+197 |
|\ \ | | | | | | | | | | | | | Conflicts: mod/search.php | ||||
| * \ | Merge pull request #316 from annando/master | Simon | 2012-05-29 | 7 | -78/+148 |
| |\ \ | | | | | | | | | Speed improvements |