aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-285-21/+157
|\
| * wrong file locationFriendika2010-12-271-0/+0
| * Add sample external authentication plugin (ldap)Friendika2010-12-274-16/+152
| * Merge branch 'fabrixxm-master'Friendika2010-12-271-5/+5
| |\
| | * Fix some IT strings typosfabrixxm2010-12-251-5/+5
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-272-3/+138
|\| |
| * | plugin changes to contact_block, also configurable limitFriendika2010-12-262-6/+16
| * | preliminary plugin hook documentationFriendika2010-12-261-0/+125
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2610-17/+63
|\| |
| * | if sub-projects cannot mandate any terms to our license, we should not force anyFriendika2010-12-252-12/+9
| * | more hooksFriendika2010-12-253-3/+20
| * | updated LICENSEFriendika2010-12-251-0/+11
| * | more plugin hooksFriendika2010-12-253-2/+22
| |/
| * secure profile redirect failed with duplex relationshipFriendika2010-12-252-7/+8
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-254-1/+20
|\|
| * addon/plugin licenses may be copyleft/AGPL/GPLFriendika2010-12-251-0/+17
| * new string wasn't configured for translation.Friendika2010-12-253-1/+3
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2513-28/+120
|\|
| * minor nits after proof-readingFriendika2010-12-241-3/+4
| * provide separate plugin settings page, update demo plugin, fix hook_registerFriendika2010-12-248-8/+40
| * link italian creative commons license to italian cc pageFriendika2010-12-241-1/+1
| * show creative commons coverage on registration pageFriendika2010-12-245-8/+26
| * undo one of the hooks from last checkin - passing objects led to errorFriendika2010-12-242-1/+5
| * more plugin hooksFriendika2010-12-241-0/+14
| * add authentication plugin hooksFriendika2010-12-241-11/+34
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-248-23/+236
|\|
| * more comments plus an id renameFriendika2010-12-232-3/+13
| * typo in commentsFriendika2010-12-231-1/+1
| * add sample plugin code + fix a couple html issues on settings pageFriendika2010-12-235-20/+212
| * debugging the plugin logic, couple of issues foundFriendika2010-12-231-2/+11
| * slight change on last commit - server discovery for legacy openidFriendika2010-12-231-1/+3
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2358-14/+2880
|\|
| * revised openid patch, added fix for Windows servers, make "is now friends wit...Friendika2010-12-237-41/+27
| * OpenID delegation degrade gracefully if database table is not updated.fabrixxm2010-12-232-17/+22
| * IT languagefabrixxm2010-12-2349-0/+2848
| * Translatable "Welcome to" in homefabrixxm2010-12-232-2/+3
| * OpenID delegation in profile pagefabrixxm2010-12-232-1/+27
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2317-52/+293
|\|
| * add more plugin hooks, etc.Friendika2010-12-224-1/+32
| * navigation aid: show server name on pageFriendika2010-12-222-0/+9
| * link the logo textFriendika2010-12-222-1/+9
| * double profile image on friend requestsFriendika2010-12-221-1/+0
| * warnings when no plugins installedFriendika2010-12-221-12/+17
| * send new friend activity when appropriateFriendika2010-12-221-0/+56
| * plugin/addon API landing - still things left to do before it's usefulFriendika2010-12-228-124/+171
| * more notes on Windows installFriendika2010-12-221-3/+4
| * some Windows (and other) installation issuesFriendika2010-12-223-7/+92
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-222-7/+24
|\|
| * allow configurable poll interval override when hub is usedFriendika2010-12-212-7/+24
* | Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2115-31/+227
|\|