aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Hauke Zuehl2012-06-162-72/+109
|\
| * Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-th...fermionic2012-06-161-71/+108
| |\
| | * more cleanupZach Prezkuta2012-06-161-15/+0
| | * some cleanup of obsolete codeZach Prezkuta2012-06-161-31/+6
| | * still need the original author information for comments and likesZach Prezkuta2012-06-161-0/+24
| | * update signature checking for relayablesZach Prezkuta2012-06-161-69/+122
| * | Merge pull request #337 from fermionic/fix-api_php-logging-typofermionic2012-06-161-1/+1
| |\ \ | | |/ | |/|
| | * fix small typo for logging command in api.phpZach Prezkuta2012-06-161-1/+1
| |/
* | Merge remote branch 'upstream/master'Hauke Zuehl2012-06-1634-524/+979
|\|
| * rev updatefriendica2012-06-163-90/+84
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-151-6/+21
| |\
| | * Merge pull request #335 from fabrixxm/masterfabrixxm2012-06-151-6/+21
| | |\
| | | * the missing mod/network.phpfabrixxm2012-06-151-6/+21
| | |/
| * / redundant log entryfriendica2012-06-141-1/+0
| |/
| * mod/network.php was lostfriendica2012-06-141-0/+679
| * highlight the lost contact messagefriendica2012-06-141-1/+1
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-144-680/+33
| |\
| | * Merge pull request #334 from fabrixxm/masterfriendica2012-06-143-680/+31
| | |\
| | | * network: fix bug #453fabrixxm2012-06-142-679/+27
| | | * quattro theme: show uncollapsed comments on display pagefabrixxm2012-06-141-1/+4
| | |/
| | * Required for github/Windowsfriendica2012-06-141-0/+2
| * | also mark for death if there isn't any xml to be foundfriendica2012-06-141-0/+3
| * | poll even if contact hasn't responded recently, so we can update the terminat...friendica2012-06-142-5/+3
| * | better handling of dead contactsfriendica2012-06-146-65/+91
| |/
| * syntax on sqlfriendica2012-06-131-1/+1
| * ajax append placeholder, fix some html warningsfriendica2012-06-138-3/+13
| * remove php version restriction on archive widgetfriendica2012-06-131-8/+4
| * couple of little fixes to enotify positional paramsfriendica2012-06-131-2/+2
| * fix to imported youtube videos, updating of contact profile photos, do not re...friendica2012-06-134-34/+105
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-131-1/+1
| |\
| | * Merge pull request #333 from Erkan-Yilmaz/masterfriendica2012-06-131-1/+1
| | |\
| | | * add missing bracketErkan Yilmaz2012-06-131-1/+1
| * | | Merge https://github.com/fabrixxm/friendica into pullfriendica2012-06-132-87/+87
| |\ \ \ | | |/ / | |/| |
| | * | enotify: fix stupid typofabrixxm2012-06-131-1/+1
| | * | enotify: rework strings to more easy to translatefabrixxm2012-06-132-3777/+3730
| | |/
| * / disable archive widget for PHP < 5.3friendica2012-06-133-32/+48
| |/
| * this should catch any weirdness caused by being in different timezones and ma...friendica2012-06-121-4/+10
| * one-click change for manage modulefriendica2012-06-121-2/+3
| * that was itfriendica2012-06-121-1/+1
| * think this will fix itfriendica2012-06-121-0/+1
| * tracking another edge casefriendica2012-06-121-2/+4
| * edge casefriendica2012-06-121-0/+2
| * archive widgetfriendica2012-06-128-14/+110
| * more fixesfriendica2012-06-124-130/+130
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-121-1/+0
| |\
| | * Removed "oauth/authorize" from the list of not implemented functions since it...Michael Vogel2012-06-121-1/+0
| * | move parens to proper placefriendica2012-06-121-5/+5
| |/
| * survive bad/un-parseable input to datetime_convertfriendica2012-06-121-1/+1
| * fix default group for local followsfriendica2012-06-121-0/+15
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-121-0/+10
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 15:29:07 +0000