aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| |\ \
| | * \ Merge pull request #331 from mexon/upstreamfriendica2012-06-121-0/+10
| | |\ \
| | | * | Add a hook for post-processing remote items after they've been stored in the ...Matthew Exon2012-06-121-0/+10
| * | | | bug #448friendica2012-06-121-3/+4
| |/ / /
| * | | revert an optimisation that was wrongfriendica2012-06-111-4/+3
| * | | date search backend to mod/networkfriendica2012-06-111-13/+37
| * | | make sure default timezone is set in external processesfriendica2012-06-113-9/+9
| * | | date based profile wall filter - backendfriendica2012-06-113-11/+42
| * | | reduce reverted edits due to edit arriving before originalfriendica2012-06-111-3/+26
| * | | variable confusion in poller, don't allow negative page offsetsfriendica2012-06-113-6/+6
| * | | sheeshfriendica2012-06-113-87/+105
| | | * Check if $rr existsHauke Zuehl2012-06-161-4/+2
* | | | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-1140-1035/+1599
|\| | |
| * | | bug #447 - make followed feeds privatefriendica2012-06-111-3/+16
| * | | Merge pull request #330 from fabrixxm/savenetworktabfriendica2012-06-111-29/+83
| |\ \ \
| | * | | network view: rembember last tab selected by userfabrixxm2012-06-111-29/+83
| |/ / /
| * | / rev updatefriendica2012-06-102-9/+9
| | |/ | |/|
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-06-102-7/+10
| |\ \
| | * \ Merge pull request #329 from simonlnu/masterSimon2012-06-092-7/+10
| | |\ \
| | | * | minor template updateSimon L'nu2012-06-092-7/+10
| | | * | Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0837-466/+937
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-050-0/+0
| * | | | rev updatefriendica2012-06-102-146/+159
| |/ / /
| * | | more logging on pubsub callbacksfriendica2012-06-081-4/+12
| * | | provide ability to autofriend ostatus accountsfriendica2012-06-071-1/+15
| * | | ostatus hub subscription issuesfriendica2012-06-073-4/+13
| * | | better events-reminder themingfriendica2012-06-072-4/+13
| * | | png support for embedded private photosfriendica2012-06-073-4/+4
| * | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-0716-81/+243
| |\ \ \
| | * \ \ Merge pull request #328 from fabrixxm/masterfriendica2012-06-0713-77/+237
| | |\ \ \