aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1817-60/+97
|\
| * tracking errant bin2hex callFriendika2011-01-173-4/+9
| * fix some linebreak issuesFriendika2011-01-172-9/+20
| * repair any bad links in activity objectsFriendika2011-01-172-2/+17
| * activity object link had incorrect attribute, highlight critical install stepsFriendika2011-01-173-3/+10
| * Merge branch 'fabrixxm-master'Friendika2011-01-173-20/+7
| |\
| | * Mods to duepuntozero .shiny classFabio Comuni2011-01-173-20/+7
| * | ensure birthday "today" calculation is relative to UTC.Friendika2011-01-171-1/+1
| |/
| * newlines were getting strippedFriendika2011-01-162-2/+1
| * there were some bug fixes, roll version numberFriendika2011-01-161-1/+1
| * birthday notifications: missing div closeFriendika2011-01-164-4/+5
| * put birthday reminders on default network page, add smileys to private mailFriendika2011-01-163-2/+6
| * apply date translation to birthday in profilesFriendika2011-01-162-4/+4
| * Don't send conversation slaps, only immediate replies. Redundant and flawed.Friendika2011-01-162-11/+19
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-159-76/+136
|\|
| * cannot pass null by referenceFriendika2011-01-141-1/+3
| * Updated IT languagefabrixxm2011-01-142-70/+96
| * string updateFriendika2011-01-142-3/+30
| * compatibility: version discoveryFriendika2011-01-145-2/+7
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-148-7/+179
|\|
| * birthday notifications workingFriendika2011-01-137-4/+125
| * create birthday event from feedFriendika2011-01-131-3/+54
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-134-1/+55
|\|
| * newlineFriendika2011-01-131-1/+2
| * Merge branch 'dev'Friendika2011-01-134-1/+54
| |\
| | * event and birthday data structuresFriendika2011-01-134-1/+54
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1310-10/+130
|\| |
| * | add owner's birthday information to feed (if allowed to)Friendika2011-01-124-6/+49
| * | preserve body content in feed to extract microformat stuffFriendika2011-01-121-0/+4
| * | string extractionFriendika2011-01-122-1/+2
| |/
| * first checkin fortunate pluginFriendika2011-01-112-0/+31
| * more doco on header/nav regionFriendika2011-01-111-2/+43
| * removed function was still referencedFriendika2011-01-111-1/+1
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-114-13/+58
|\|
| * more defensive measures against failed or lost DBFriendika2011-01-101-4/+22
| * fallback dbesc() when db is not thereFriendika2011-01-101-1/+4
| * add page start/end hooks, cleanup couple of notice msgsFriendika2011-01-103-8/+32
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-101-0/+1
|\|
| * call get_app()Friendika2011-01-091-0/+1
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0818-693/+98
|\|
| * missing 'else'Friendika2011-01-071-0/+4
| * moved notify counters (.nav-ajax) down to match new layoutFriendika2011-01-071-1/+1
| * removed FreeSans font, changed .shiny background, fixed head areafabrixxm2011-01-075-681/+11
| * darkness theme cleanupFriendika2011-01-071-1/+11
| * darkness: input fields were invisibleFriendika2011-01-071-1/+1
| * use default system theme for system pagesFriendika2011-01-075-5/+16
| * more goldenrod stuffFriendika2011-01-071-1/+1
| * fix goldenrod after recent changesFriendika2011-01-071-0/+4
| * add contact edit hooksFriendika2011-01-073-2/+19
| * Merge branch 'master' of file:///home/macgirvin/friendika/friendikaFriendika2011-01-070-0/+0
| |\