aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge branch 'fabrixxm-master'Friendika2011-01-049-2/+51
| |\
| | * Merge branch 'friendika-master'fabrixxm2011-01-044-0/+11
| | |\
| | * | Manage user registrations in REGISTER_APPROVE mode.fabrixxm2011-01-049-2/+51
| * | | use shift-home instead to take you homeFriendika2011-01-042-4/+12
| | |/ | |/|
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-048-34/+61
|\| |
| * | provide "return home" keyFriendika2011-01-044-0/+11
| |/
| * Updated IT stringsfabrixxm2011-01-041-3/+10
| * convert received ostatus unfollow verb to activity streams stop-followingFriendika2011-01-041-1/+11
| * much better solution to privacy on ajax wall photosFriendika2011-01-042-30/+29
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0427-112/+2022
|\|
| * missing pagination in photo collectionsFriendika2011-01-041-4/+9
| * set_config anomalyFriendika2011-01-031-2/+7
| * set permissions of uploaded wall photo to match those of theFriendika2011-01-031-0/+44
| * settings: ensure system theme is default selectionFriendika2011-01-031-1/+6
| * string updateFriendika2011-01-031-1/+2
| * fix typo, check for empty group in network pageFriendika2011-01-034-8/+13
| * email check failed, translate wall_item templateFriendika2011-01-036-5/+8
| * change activitystreams unfollow to stop-follow but also send out OStatus unfo...Friendika2011-01-034-3/+6
| * Stupid fix in boot.phpfabrixxm2011-01-031-1/+1
| * add plugin hook to home page contentfabrixxm2011-01-032-0/+7
| * import items from feeds in inverse date orderfabrixxm2011-01-032-4/+7
| * Add sitename in page titlefabrixxm2011-01-031-1/+2
| * Fix secure cursor and aside position in duepuntozero themefabrixxm2011-01-031-2/+10
| * Fix to Italian languagefabrixxm2011-01-037-86/+86
| * Merge branch 'friendika-master'fabrixxm2011-01-0323-123/+1447
| |\
| * | duepuntozero themefabrixxm2010-12-283-0/+1820
| * | 'system','theme' config to set default site themefabrixxm2010-12-281-2/+2
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0310-22/+48
|\ \ \ | | |/ | |/|
| * | site config to force publish in site directoryFriendika2011-01-022-10/+13
| * | don't process empty or non-existent group arrayFriendika2011-01-021-2/+3
| * | validate the openid url as well. We won't change it if it's bogus, but we won...Friendika2011-01-021-1/+2
| * | don't update openidserver if openid is emptyFriendika2011-01-021-5/+9
| * | don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't)Friendika2011-01-022-1/+3
| * | valid host checks were returning true on TXT records and other useless garbageFriendika2011-01-022-2/+3
| * | typo slipped throughFriendika2011-01-021-1/+1
| * | alt profiles not clickableFriendika2011-01-021-1/+1
| * | missing thumbnail in new profilesFriendika2011-01-021-1/+2
| * | declare key size/algorithm to ensure key gets generatedFriendika2011-01-021-0/+13
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-025-5/+42
|\| |
| * | add plugin hooks to personal XRDFriendika2011-01-012-0/+10
| * | try to auto-fill the profile address if we actually do know it.Friendika2011-01-013-5/+32
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-011-1/+1
|\| |