| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Merge pull request #336 from hauke68/master | friendica | 2012-06-16 | 1 | -4/+2 |
|\ |
|
| * | Merge remote branch 'upstream/master' | Hauke Zuehl | 2012-06-16 | 2 | -72/+109 |
| |\
| |/
|/| |
|
* | | Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-th... | fermionic | 2012-06-16 | 1 | -71/+108 |
|\ \ |
|
| * | | 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 |
* | | | Merge pull request #337 from fermionic/fix-api_php-logging-typo | fermionic | 2012-06-16 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | 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 | 34 | -524/+979 |
| |\
| |/
|/| |
|
* | | rev update | friendica | 2012-06-16 | 3 | -90/+84 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-15 | 1 | -6/+21 |
|\ \ |
|
| * \ | Merge pull request #335 from fabrixxm/master | fabrixxm | 2012-06-15 | 1 | -6/+21 |
| |\ \ |
|
| | * | | the missing mod/network.php | fabrixxm | 2012-06-15 | 1 | -6/+21 |
| |/ / |
|
* / / | redundant log entry | friendica | 2012-06-14 | 1 | -1/+0 |
|/ / |
|
* | | mod/network.php was lost | friendica | 2012-06-14 | 1 | -0/+679 |
* | | highlight the lost contact message | friendica | 2012-06-14 | 1 | -1/+1 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-14 | 4 | -680/+33 |
|\ \ |
|
| * \ | Merge pull request #334 from fabrixxm/master | friendica | 2012-06-14 | 3 | -680/+31 |
| |\ \ |
|
| | * | | network: fix bug #453 | fabrixxm | 2012-06-14 | 2 | -679/+27 |
| | * | | quattro theme: show uncollapsed comments on display page | fabrixxm | 2012-06-14 | 1 | -1/+4 |
| |/ / |
|
| * | | Required for github/Windows | friendica | 2012-06-14 | 1 | -0/+2 |
* | | | 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 terminat... | friendica | 2012-06-14 | 2 | -5/+3 |
* | | | better handling of dead contacts | friendica | 2012-06-14 | 6 | -65/+91 |
|/ / |
|
* | | syntax on sql | friendica | 2012-06-13 | 1 | -1/+1 |
* | | ajax append placeholder, fix some html warnings | friendica | 2012-06-13 | 8 | -3/+13 |
* | | 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 re... | friendica | 2012-06-13 | 4 | -34/+105 |
* | | 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 |
| |\ \ |
|
| | * | | add missing bracket | Erkan Yilmaz | 2012-06-13 | 1 | -1/+1 |
* | | | | Merge https://github.com/fabrixxm/friendica into pull | friendica | 2012-06-13 | 2 | -87/+87 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | enotify: fix stupid typo | fabrixxm | 2012-06-13 | 1 | -1/+1 |
| * | | | enotify: rework strings to more easy to translate | fabrixxm | 2012-06-13 | 2 | -3777/+3730 |
| |/ / |
|
* / / | disable archive widget for PHP < 5.3 | friendica | 2012-06-13 | 3 | -32/+48 |
|/ / |
|
* | | this should catch any weirdness caused by being in different timezones and ma... | friendica | 2012-06-12 | 1 | -4/+10 |
* | | one-click change for manage module | friendica | 2012-06-12 | 1 | -2/+3 |
* | | 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 | 8 | -14/+110 |
* | | more fixes | friendica | 2012-06-12 | 4 | -130/+130 |
* | | 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 it... | Michael Vogel | 2012-06-12 | 1 | -1/+0 |
* | | | 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 |
* | | fix default group for local follows | friendica | 2012-06-12 | 1 | -0/+15 |