Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Added missing backticks to navigation bar query | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -1/+1 |
| | | |||||
* | | Enabled Profile photo revisions to be displayed in navigation bar | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -2/+2 |
|/ | |||||
* | rev update | friendica | 2012-06-16 | 1 | -3/+3 |
| | |||||
* | Merge remote branch 'upstream/master' | Hauke Zuehl | 2012-06-16 | 2 | -72/+109 |
|\ | |||||
| * | Merge pull request #338 from ↵ | fermionic | 2012-06-16 | 1 | -71/+108 |
| |\ | | | | | | | | | | | | | fermionic/diaspora-dont-check-more-signatures-than-diaspora-does Diaspora dont check more signatures than diaspora does | ||||
| | * | 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 |
| | | | |||||
| * | | fix small typo for logging command in api.php | Zach Prezkuta | 2012-06-16 | 1 | -1/+1 |
| |/ | |||||
* | | Merge remote branch 'upstream/master' | Hauke Zuehl | 2012-06-16 | 11 | -84/+295 |
|\| | |||||
| * | rev update | friendica | 2012-06-16 | 1 | -10/+0 |
| | | |||||
| * | redundant log entry | friendica | 2012-06-14 | 1 | -1/+0 |
| | | |||||
| * | also mark for death if there isn't any xml to be found | friendica | 2012-06-14 | 1 | -0/+3 |
| | | |||||
| * | poll even if contact hasn't responded recently, so we can update the ↵ | friendica | 2012-06-14 | 2 | -5/+3 |
| | | | | | | | | termination status | ||||
| * | better handling of dead contacts | friendica | 2012-06-14 | 2 | -1/+8 |
| | | |||||
| * | syntax on sql | friendica | 2012-06-13 | 1 | -1/+1 |
| | | |||||
| * | remove php version restriction on archive widget | friendica | 2012-06-13 | 1 | -8/+4 |
| | | |||||
| * | couple of little fixes to enotify positional params | friendica | 2012-06-13 | 1 | -2/+2 |
| | | |||||
| * | fix to imported youtube videos, updating of contact profile photos, do not ↵ | friendica | 2012-06-13 | 4 | -34/+105 |
| | | | | | | | | remove "dead" contacts but archive them. | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge pull request #333 from Erkan-Yilmaz/master | friendica | 2012-06-13 | 1 | -1/+1 |
| | |\ | | | | | | | | | missing bracket | ||||
| | | * | add missing bracket | Erkan Yilmaz | 2012-06-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge https://github.com/fabrixxm/friendica into pull | friendica | 2012-06-13 | 1 | -21/+41 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: util/messages.po | ||||
| | * | | enotify: fix stupid typo | fabrixxm | 2012-06-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | enotify: rework strings to more easy to translate | fabrixxm | 2012-06-13 | 1 | -21/+41 |
| | |/ | |||||
| * / | disable archive widget for PHP < 5.3 | friendica | 2012-06-13 | 1 | -0/+12 |
| |/ | |||||
| * | this should catch any weirdness caused by being in different timezones and ↵ | friendica | 2012-06-12 | 1 | -4/+10 |
| | | | | | | | | making your first post on the 31st of March | ||||
| * | that was it | friendica | 2012-06-12 | 1 | -1/+1 |
| | | |||||
| * | think this will fix it | friendica | 2012-06-12 | 1 | -0/+1 |
| | | |||||
| * | tracking another edge case | friendica | 2012-06-12 | 1 | -2/+4 |
| | | |||||
| * | edge case | friendica | 2012-06-12 | 1 | -0/+2 |
| | | |||||
| * | archive widget | friendica | 2012-06-12 | 1 | -0/+47 |
| | | |||||
| * | more fixes | friendica | 2012-06-12 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-12 | 1 | -1/+0 |
| |\ | |||||
| | * | Removed "oauth/authorize" from the list of not implemented functions since ↵ | Michael Vogel | 2012-06-12 | 1 | -1/+0 |
| | | | | | | | | | | | | it is implemented in "mod/api.php" | ||||
| * | | move parens to proper place | friendica | 2012-06-12 | 1 | -5/+5 |
| |/ | |||||
| * | survive bad/un-parseable input to datetime_convert | friendica | 2012-06-12 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #331 from mexon/upstream | friendica | 2012-06-12 | 1 | -0/+10 |
| |\ | | | | | | | Add a hook for post-processing remote items | ||||
| | * | Add a hook for post-processing remote items after they've been stored in the ↵ | Matthew Exon | 2012-06-12 | 1 | -0/+10 |
| | | | | | | | | | | | | database and have an ID | ||||
| * | | revert an optimisation that was wrong | friendica | 2012-06-11 | 1 | -4/+3 |
| | | | |||||
| * | | date based profile wall filter - backend | friendica | 2012-06-11 | 1 | -0/+13 |
| | | | |||||
| * | | reduce reverted edits due to edit arriving before original | friendica | 2012-06-11 | 1 | -3/+26 |
| | | | |||||
| * | | variable confusion in poller, don't allow negative page offsets | friendica | 2012-06-11 | 2 | -4/+4 |
| | | | |||||
| * | | sheesh | friendica | 2012-06-11 | 1 | -1/+1 |
| | | |