Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | | * | 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 |
| | |\ | | | | | | | | | Fix bug 453 and small update to quattro theme | ||||
| | | * | 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 ↵ | friendica | 2012-06-14 | 2 | -5/+3 |
| | | | | | | | | | | | | termination status | ||||
| * | | 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 ↵ | 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 | 2 | -87/+87 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | 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 | 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 ↵ | friendica | 2012-06-12 | 1 | -4/+10 |
| | | | | | | | | making your first post on the 31st of March | ||||
| * | 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 ↵ | 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 |
| | | |||||
| * | fix default group for local follows | friendica | 2012-06-12 | 1 | -0/+15 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-12 | 1 | -0/+10 |
| |\ | |||||
| | * | 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 | ||||
| * | | | bug #448 | friendica | 2012-06-12 | 1 | -3/+4 |
| |/ / | |||||
| * | | revert an optimisation that was wrong | friendica | 2012-06-11 | 1 | -4/+3 |
| | | | |||||
| * | | date search backend to mod/network | friendica | 2012-06-11 | 1 | -13/+37 |
| | | | |||||
| * | | make sure default timezone is set in external processes | friendica | 2012-06-11 | 3 | -9/+9 |
| | | | |||||
| * | | date based profile wall filter - backend | friendica | 2012-06-11 | 3 | -11/+42 |
| | | | |||||
| * | | reduce reverted edits due to edit arriving before original | friendica | 2012-06-11 | 1 | -3/+26 |
| | | |