aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-216-35/+59
|\
| * repair double-encoded double quotesFriendika2011-01-201-2/+2
| * profile edit hooksFriendika2011-01-203-0/+14
| * per fabrix, except do the login "on page"Friendika2011-01-201-3/+5
| * Fixs to IT languagesfabrixxm2011-01-201-31/+33
| * Netwok page redirect to login page if not local_userfabrixxm2011-01-201-2/+5
| * show 'login' tab selected on login pagefabrixxm2011-01-201-1/+4
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-2010-31/+173
|\|
| * do a better job of comparing same URLs.Friendika2011-01-194-7/+26
| * fix context linksFriendika2011-01-191-2/+2
| * network view all item types by dateFriendika2011-01-196-20/+142
| * undo sql change in f9f018ef083acb554003 (02-DEC-2010), not relevant and incor...Friendika2011-01-191-1/+1
| * Small fixs to IT languageFabio Comuni2011-01-193-3/+4
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1913-11/+67
|\|
| * SECURITY: update java uploaderFriendika2011-01-191-0/+0
| * new profile_sidebar_enter hook, changed profile_sidebar to arrayFriendika2011-01-182-3/+12
| * list network page (parent items) by creation date thx:fabrixFriendika2011-01-181-2/+5
| * personal titleFriendika2011-01-1810-6/+50
* | 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