aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-3129-135/+321
|\
| * limit privacy ACL's to networks which can handle privacyFriendika2011-01-302-8/+10
| * disable "take me home" hotkey, different on FF (shift-home), IE ($).Friendika2011-01-301-6/+7
| * more ssl_policy cleanup, allow manual feed update per contact when hub is wha...Friendika2011-01-3010-12/+42
| * wrong ref in ssl policyFriendika2011-01-304-5/+5
| * more debugging to see if the google push hub is even trying to publish our co...Friendika2011-01-302-0/+2
| * identify email-only contactsFriendika2011-01-291-1/+8
| * even more cleanup prior to pushFriendika2011-01-291-3/+1
| * cleanup ssl_policy implementationFriendika2011-01-291-4/+4
| * implement SSL redirection policy (none, full, selfsign)Friendika2011-01-291-1/+18
| * document poormancron as alternative in INSTALL.txtFriendika2011-01-291-1/+16
| * Merge branch 'fabrixxm-master'Friendika2011-01-2816-105/+219
| |\
| | * updated poormancron pluginFabio Comuni2011-01-281-19/+16
| | * modded scripts to be runned in cli so they can be included and executed in ma...Fabio Comuni2011-01-284-56/+94
| | * cal proc_run hook before string escapeFabio Comuni2011-01-281-6/+3
| | * first try of 'poormancron' whith 'proc_run' hookfabrixxm2011-01-241-0/+51
| | * Mods to script runned via CLI to permits to run also includedfabrixxm2011-01-244-26/+33
| | * Added proc_run() and modified all occurrence of proc_close(proc_open()) to us...fabrixxm2011-01-2411-30/+58
* | | Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-2818-452/+666
|\| |
| * | tag finder tweakFriendika2011-01-271-1/+1
| * | removed java photo uploader from mainline. Photo uploaders are now plugins, b...Friendika2011-01-2713-101/+186
| * | remote linksFriendika2011-01-272-4/+4
| * | Merge branch 'omigeot-master'Friendika2011-01-274-337/+336
| |\ \
| | * \ Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-ma...Friendika2011-01-274-337/+336
| | |\ \
| | | * | More translationolivierm2011-01-271-1/+1
| | | * | Done head.tplolivierm2011-01-271-1/+1
| | | * | French translation : Done strings.php, started template files.olivierm2011-01-272-335/+334
| * | | | still not quite ready for the big photos rolloverFriendika2011-01-272-83/+61
| * | | | Revert "Revert "roll version - now in alpha 2.1""Friendika2011-01-275-75/+227
| * | | | Revert "roll version - now in alpha 2.1"Friendika2011-01-275-227/+75
| * | | | roll version - now in alpha 2.1Friendika2011-01-275-75/+227
* | | | | Merge branch 'friendika-master'fabrixxm2011-01-2793-36/+7067
|\| | | |
| * | | | set update frequency to twice daily for 'feed' contacts, unable to set update...Friendika2011-01-266-15/+26
| * | | | search icons (?)Friendika2011-01-264-1/+6
| * | | | Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-...Friendika2011-01-2612-10/+178
| |\ \ \ \
| | * | | | Rewrite oembed plugin to use new bbcode tag [embed] and make discovery server...Fabio Comuni2011-01-262-44/+48
| | * | | | remove fixed width from wall-item-contentFabio Comuni2011-01-261-1/+1
| | * | | | oembed consumer pluginFabio Comuni2011-01-263-0/+107
| | * | | | add [img=wxh][/img] support in tinymce bbcode pluginFabio Comuni2011-01-261-0/+5
| | * | | | Add 'jot_tool' hook, plugins can add tool icons.Fabio Comuni2011-01-268-5/+54
| * | | | | Piwik plugin for FriendikaTobias Diekershoff2011-01-262-0/+72
| * | | | | dissolve relationship (new protocol) workingFriendika2011-01-263-11/+21
| * | | | | work in progress js_uploader plugin, turn java uploader into plugin - not don...Friendika2011-01-2668-0/+6768
| * | | | | whitespace onlyFriendika2011-01-261-1/+1
| * | | | | no comment box if no notify, not no pollFriendika2011-01-251-2/+2
* | | | | | Merge branch 'friendika-master'fabrixxm2011-01-2557-11/+2930
|\| | | | | | |/ / / / |/| | | |
| * | | | smilies on new item viewFriendika2011-01-251-1/+1
| * | | | greenzero stripped to bare essentials, imported from duepuntozeroFriendika2011-01-251-1865/+7
| * | | | renamed theme - it was a bit too longFriendika2011-01-254-0/+0
| * | | | Merge branch 'master' of https://github.com/tobiasd/friendika into tobiasd-ma...Friendika2011-01-2554-0/+4756
| |\ \ \ \