aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * firend request homecoming - ensure login redirects back to confirmation page,Friendika2011-01-071-1/+24
| * | friend request homecoming - ensure login redirects back to confirmation page,Friendika2011-01-071-1/+24
| |/
| * schema typoFriendika2011-01-062-1/+7
| * undo freesans temporarily due to poor legibility.Friendika2011-01-062-2/+2
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-066-8/+706
|\|
| * clarify license for addon themesFriendika2011-01-061-5/+9
| * Merge branch 'fabrixxm-master'Friendika2011-01-065-3/+697
| |\
| | * Added shiny class to duepuntozero themefabrixxm2011-01-062-1/+7
| | * make the name stand out another bit more, and load FreeSans font from site in...fabrixxm2011-01-054-2/+690
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-063-8/+14
|\| |
| * | plugin settings were getting changedFriendika2011-01-053-8/+14
| |/
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-058-6/+28
|\|
| * make the name stand out just a bit moreFriendika2011-01-051-0/+4
| * fix geolocationFriendika2011-01-051-1/+1
| * make home tab work from remote profile, fix link in comment notify emailsFriendika2011-01-053-2/+9
| * couple minor issues with reg queueFriendika2011-01-042-3/+3
| * secure admin hijacking from openidFriendika2011-01-041-0/+11
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0512-6/+72
|\|
| * prevent admin hijacksFriendika2011-01-043-1/+10