Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | typos | friendica | 2012-06-25 | 2 | -2/+2 |
| | |||||
* | add event titles to discovered birthday events | friendica | 2012-06-25 | 2 | -6/+11 |
| | |||||
* | change required doco | friendica | 2012-06-25 | 1 | -2/+5 |
| | |||||
* | change event behaviour so that title is required but description is not | friendica | 2012-06-25 | 1 | -2/+2 |
| | |||||
* | event summary/title | friendica | 2012-06-25 | 2 | -2/+15 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 3 | -37/+55 |
|\ | |||||
| * | add some debug logging | Zach Prezkuta | 2012-06-25 | 1 | -0/+1 |
| | | |||||
| * | revert extra Diaspora disabling changes to try to eliminate Mustard ↵ | Zach Prezkuta | 2012-06-25 | 3 | -43/+23 |
| | | | | | | | | double-posting | ||||
| * | Clean up the Diaspora connectivity: | Zach Prezkuta | 2012-06-25 | 3 | -55/+92 |
| | | | | | | | | | | - Move Diaspora code into separate functions to make it more modular - Create more checks for whether Diaspora connectivity has been enabled | ||||
* | | propagate remote deletes | friendica | 2012-06-25 | 1 | -5/+8 |
| | | |||||
* | | improve remote delete forwarding | friendica | 2012-06-25 | 2 | -2/+64 |
|/ | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: include/bbcode.php | ||||
| * | fix typo and syntax error | Simon L'nu | 2012-06-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | typos in bbcode, add service class restrictions to jot uploads | friendica | 2012-06-25 | 3 | -11/+14 |
|/ | |||||
* | Merge pull request #360 from fermionic/more-nested-lists | friendica | 2012-06-25 | 2 | -10/+13 |
|\ | | | | | allow nested [ol] and [ul] lists too | ||||
| * | allow nested [ol] and [ul] lists too | Zach Prezkuta | 2012-06-25 | 2 | -10/+13 |
| | | |||||
* | | fix check for parent of StatusNet API post | Zach Prezkuta | 2012-06-25 | 2 | -10/+11 |
|/ | |||||
* | more service class functionality | friendica | 2012-06-25 | 1 | -0/+5 |
| | |||||
* | service limits for photo uploads | friendica | 2012-06-25 | 1 | -0/+25 |
| | |||||
* | implement "follow" service limits | friendica | 2012-06-24 | 2 | -1/+50 |
| | |||||
* | add like/dislike to profiles | friendica | 2012-06-24 | 1 | -0/+5 |
| | |||||
* | service class basics | friendica | 2012-06-24 | 2 | -4/+48 |
| | |||||
* | Merge pull request #357 from fermionic/fix-relayable-signature-handle | fermionic | 2012-06-23 | 1 | -77/+20 |
|\ | | | | | ok now I'm just making silly mistakes--take out premature function locki... | ||||
| * | ok now I'm just making silly mistakes--take out premature function locking code | Zach Prezkuta | 2012-06-23 | 1 | -77/+20 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-23 | 2 | -24/+90 |
|\ \ | |||||
| * | | Merge pull request #356 from fermionic/fix-relayable-signature-handle | fermionic | 2012-06-23 | 1 | -24/+84 |
| |\| | | | | | | | use author handle instead of sender handle | ||||
| | * | use author handle instead of sender handle | Zach Prezkuta | 2012-06-23 | 1 | -24/+84 |
| | | | |||||
| * | | allow bare URLS to make it through to Diaspora | Zach Prezkuta | 2012-06-23 | 1 | -0/+6 |
| |/ | |||||
* / | sort out some "like" issues | friendica | 2012-06-23 | 2 | -9/+13 |
|/ | |||||
* | small optimization | Zach Prezkuta | 2012-06-23 | 1 | -5/+3 |
| | |||||
* | fix BB-to-Diaspora list formatting | Zach Prezkuta | 2012-06-23 | 1 | -3/+43 |
| | |||||
* | allow linking to Diaspora's scaled-down images | Zach Prezkuta | 2012-06-23 | 2 | -4/+17 |
| | |||||
* | this is going to take some more debug before it can be roller out | friendica | 2012-06-23 | 1 | -2/+2 |
| | |||||
* | debugging | friendica | 2012-06-23 | 1 | -1/+2 |
| | |||||
* | cokmment likes not propagating | friendica | 2012-06-23 | 1 | -2/+5 |
| | |||||
* | make feeds work with comment likes/dislikes | friendica | 2012-06-23 | 1 | -1/+1 |
| | |||||
* | typo | friendica | 2012-06-23 | 1 | -2/+4 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-23 | 11 | -34/+2980 |
|\ | |||||
| * | Merge remote branch 'upstream/master' | Michael Vogel | 2012-06-23 | 10 | -108/+219 |
| |\ | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php | ||||
| * | | Diaspora: Messages are now looking better | Michael Vogel | 2012-06-23 | 1 | -2/+18 |
| | | | |||||
| * | | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-06-18 | 11 | -35/+2963 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: include/oembed.php | ||||
| | * | | New option in the bbcode parser to disable oembed. | Michael Vogel | 2012-06-18 | 2 | -26/+35 |
| | | | | |||||
| | * | | New function to convert bbcode to markdown. | Michael Vogel | 2012-06-17 | 10 | -19/+2939 |
| | | | | |||||
| * | | | OEmbed: Don't output the width of images | Michael | 2012-06-18 | 1 | -1/+2 |
| | | | | |||||
* | | | | like comments | friendica | 2012-06-23 | 1 | -2/+2 |
| | | | | |||||
* | | | | liking comments backend | friendica | 2012-06-23 | 1 | -8/+12 |
| |_|/ |/| | | |||||
* | | | cleanup lists and more comment signature stuff | Zach Prezkuta | 2012-06-22 | 1 | -2/+13 |
| | | | |||||
* | | | expand support for BB code-to-Diaspora conversion | Zach Prezkuta | 2012-06-22 | 1 | -20/+42 |
| | | | |||||
* | | | Added ORDER BY clause for conversation view | Max Weller | 2012-06-21 | 1 | -1/+1 |
| | | | |||||
* | | | Added statuses/show parameter ?conversation=true | Max Weller | 2012-06-21 | 1 | -10/+17 |
| | | |