aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'friendika-master'fabrixxm2011-02-0135-89/+374
|\
| * let there be purple! ;-)Friendika2011-01-314-0/+27
| * readjust name length limits - acl selectorFriendika2011-01-311-1/+1
| * truncate names in acl selectorFriendika2011-01-311-2/+5
| * email cc recipients (front end)Friendika2011-01-316-4/+26
| * post to email recips (backend)Friendika2011-01-311-2/+29
| * Merge branch 'fabrixxm-oembed'Friendika2011-01-319-48/+126
| |\
| | * cache oembed requestFabio Comuni2011-01-311-2/+14
| | * delete old cache in poller.phpFabio Comuni2011-01-311-0/+4
| | * add cache tableFabio Comuni2011-01-313-2/+14
| | * use microformat to mark html from [embed] tag, convert html with oembed micro...Fabio Comuni2011-01-313-5/+44
| | * Add 'system''no_oembed' config optionFabio Comuni2011-01-312-4/+8
| | * Move [embed] bbtag from oembed plugin to coreFabio Comuni2011-01-313-45/+52
| * | force text paste in editorFriendika2011-01-311-3/+11
| * | deliver up to 150 contacts per person using dfrn - in case hub is whackedFriendika2011-01-311-1/+49
| |/
| * 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 'master' of github.com:fabrixxm/friendikafabrixxm2011-01-290-0/+0
|\ \
| * \ Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-2818-452/+666
| |\ \
* | \ \ Merge branch 'friendika-master'fabrixxm2011-01-2916-105/+219
|\ \ \ \ | | |_|/ | |/| |
| * | | 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 branch 'friendika-master'fabrixxm2011-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